From d3135898fd195915fb7ec832d895defc8387b5d4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 13 Oct 2020 17:35:07 +0200
Subject: [PATCH 001/228] [users] More fine-grained group descriptions

Describe groups with more detail:
 - groups can be system groups (low GID) or not
 - groups may be pre-configured (e.g. come from the unpackfs stage)
---
 src/modules/users/Config.cpp | 16 ++++++++++---
 src/modules/users/Config.h   | 44 ++++++++++++++++++++++++++++++++++--
 2 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index d0f573286..e190b30dc 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -590,8 +590,12 @@ Config::checkReady()
 
 
 STATICTEST void
-setConfigurationDefaultGroups( const QVariantMap& map, QStringList& defaultGroups )
+setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription >& defaultGroups )
 {
+    defaultGroups.clear();
+    auto groupsFromConfig = map.value( "defaultGroups" ).toList();
+    cDebug() << groupsFromConfig;
+#if 0
     // '#' is not a valid group name; use that to distinguish an empty-list
     // in the configuration (which is a legitimate, if unusual, choice)
     // from a bad or missing configuration value.
@@ -601,6 +605,7 @@ setConfigurationDefaultGroups( const QVariantMap& map, QStringList& defaultGroup
         cWarning() << "Using fallback groups. Please check *defaultGroups* in users.conf";
         defaultGroups = QStringList { "lp", "video", "network", "storage", "wheel", "audio" };
     }
+#endif
 }
 
 STATICTEST HostNameActions
@@ -737,8 +742,13 @@ Config::createJobs() const
 
     Calamares::Job* j;
 
-    j = new CreateUserJob(
-        loginName(), fullName().isEmpty() ? loginName() : fullName(), doAutoLogin(), defaultGroups() );
+    QStringList groupNames = std::accumulate(
+        m_defaultGroups.begin(),
+        m_defaultGroups.end(),
+        QStringList(),
+        []( const QStringList& l, const GroupDescription& g ) { return QStringList( l ) << g.name(); } );
+
+    j = new CreateUserJob( loginName(), fullName().isEmpty() ? loginName() : fullName(), doAutoLogin(), groupNames );
     jobs.append( Calamares::job_ptr( j ) );
 
     j = new SetPasswordJob( loginName(), userPassword() );
diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h
index e4057941c..384575ed4 100644
--- a/src/modules/users/Config.h
+++ b/src/modules/users/Config.h
@@ -15,6 +15,7 @@
 #include "Job.h"
 #include "utils/NamedEnum.h"
 
+#include <QList>
 #include <QObject>
 #include <QVariantMap>
 
@@ -30,6 +31,45 @@ Q_DECLARE_OPERATORS_FOR_FLAGS( HostNameActions )
 
 const NamedEnumTable< HostNameAction >& hostNameActionNames();
 
+/** @brief Settings for a single group
+ *
+ * The list of defaultgroups from the configuration can be
+ * set up in a fine-grained way, with both user- and system-
+ * level groups; this class stores a configuration for each.
+ */
+class GroupDescription
+{
+public:
+    ///@brief An invalid, empty group
+    GroupDescription() {}
+
+    ///@brief A group with full details
+    GroupDescription( const QString& name, bool mustExistAlready = false, bool isSystem = false )
+        : m_name( name )
+        , m_isValid( !name.isEmpty() )
+        , m_mustAlreadyExist( mustExistAlready )
+        , m_isSystem( isSystem )
+    {
+    }
+
+    bool isValid() const { return m_isValid; }
+    bool isSystemGroup() const { return m_isSystem; }
+    QString name() const { return m_name; }
+
+    ///@brief Equality of groups depends only on name and kind
+    bool operator==( const GroupDescription& rhs ) const
+    {
+        return rhs.name() == name() && rhs.isSystemGroup() == isSystemGroup();
+    }
+
+private:
+    QString m_name;
+    bool m_isValid = false;
+    bool m_mustAlreadyExist = false;
+    bool m_isSystem = false;
+};
+
+
 class Config : public QObject
 {
     Q_OBJECT
@@ -158,7 +198,7 @@ public:
     /// Current setting for "require strong password"?
     bool requireStrongPasswords() const { return m_requireStrongPasswords; }
 
-    const QStringList& defaultGroups() const { return m_defaultGroups; }
+    const QList< GroupDescription >& defaultGroups() const { return m_defaultGroups; }
 
     // The user enters a password (and again in a separate UI element)
     QString userPassword() const { return m_userPassword; }
@@ -242,7 +282,7 @@ private:
     PasswordStatus passwordStatus( const QString&, const QString& ) const;
     void checkReady();
 
-    QStringList m_defaultGroups;
+    QList< GroupDescription > m_defaultGroups;
     QString m_userShell;
     QString m_autologinGroup;
     QString m_sudoersGroup;

From e46d9f735d8c6fd2ebc0e72124d7360d1e0d1b82 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 13 Oct 2020 17:36:24 +0200
Subject: [PATCH 002/228] [users] Adjust tests to changed groups-list

---
 src/modules/users/Tests.cpp | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index 9ed7718c7..ac3a03446 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -16,7 +16,7 @@
 #include <QtTest/QtTest>
 
 // Implementation details
-extern void setConfigurationDefaultGroups( const QVariantMap& map, QStringList& defaultGroups );
+extern void setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription >& defaultGroups );
 extern HostNameActions getHostNameActions( const QVariantMap& configurationMap );
 extern bool addPasswordCheck( const QString& key, const QVariant& value, PasswordCheckList& passwordChecks );
 
@@ -56,29 +56,32 @@ void
 UserTests::testDefaultGroups()
 {
     {
-        QStringList groups;
+        QList< GroupDescription > groups;
         QVariantMap hweelGroup;
         QVERIFY( groups.isEmpty() );
         hweelGroup.insert( "defaultGroups", QStringList { "hweel" } );
         setConfigurationDefaultGroups( hweelGroup, groups );
         QCOMPARE( groups.count(), 1 );
-        QVERIFY( groups.contains( "hweel" ) );
+        QVERIFY( groups.contains( GroupDescription( "hweel" ) ) );
     }
 
     {
         QStringList desired { "wheel", "root", "operator" };
-        QStringList groups;
+        QList< GroupDescription > groups;
         QVariantMap threeGroup;
         QVERIFY( groups.isEmpty() );
         threeGroup.insert( "defaultGroups", desired );
         setConfigurationDefaultGroups( threeGroup, groups );
         QCOMPARE( groups.count(), 3 );
-        QVERIFY( !groups.contains( "hweel" ) );
-        QCOMPARE( groups, desired );
+        QVERIFY( !groups.contains( GroupDescription( "hweel" ) ) );
+        for ( const auto& s : desired )
+        {
+            QVERIFY( groups.contains( GroupDescription( s ) ) );
+        }
     }
 
     {
-        QStringList groups;
+        QList< GroupDescription > groups;
         QVariantMap explicitEmpty;
         QVERIFY( groups.isEmpty() );
         explicitEmpty.insert( "defaultGroups", QStringList() );
@@ -87,22 +90,22 @@ UserTests::testDefaultGroups()
     }
 
     {
-        QStringList groups;
+        QList< GroupDescription > groups;
         QVariantMap missing;
         QVERIFY( groups.isEmpty() );
         setConfigurationDefaultGroups( missing, groups );
         QCOMPARE( groups.count(), 6 );  // because of fallback!
-        QVERIFY( groups.contains( "lp" ) );
+        QVERIFY( groups.contains( GroupDescription( "lp" ) ) );
     }
 
     {
-        QStringList groups;
+        QList< GroupDescription > groups;
         QVariantMap typeMismatch;
         QVERIFY( groups.isEmpty() );
         typeMismatch.insert( "defaultGroups", 1 );
         setConfigurationDefaultGroups( typeMismatch, groups );
         QCOMPARE( groups.count(), 6 );  // because of fallback!
-        QVERIFY( groups.contains( "lp" ) );
+        QVERIFY( groups.contains( GroupDescription( "lp" ) ) );
     }
 }
 

From ceeab7087cd0ad792390615eda0e1dc8fa9fb17d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 13 Oct 2020 22:12:26 +0200
Subject: [PATCH 003/228] [users] Fix implementation so existing tests pass

---
 src/modules/users/Config.cpp | 42 ++++++++++++++++++++++++++----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index e190b30dc..73465edc2 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -593,19 +593,39 @@ STATICTEST void
 setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription >& defaultGroups )
 {
     defaultGroups.clear();
-    auto groupsFromConfig = map.value( "defaultGroups" ).toList();
-    cDebug() << groupsFromConfig;
-#if 0
-    // '#' is not a valid group name; use that to distinguish an empty-list
-    // in the configuration (which is a legitimate, if unusual, choice)
-    // from a bad or missing configuration value.
-    defaultGroups = CalamaresUtils::getStringList( map, QStringLiteral( "defaultGroups" ), QStringList { "#" } );
-    if ( defaultGroups.contains( QStringLiteral( "#" ) ) )
+
+    const QString key( "defaultGroups" );
+    auto groupsFromConfig = map.value( key ).toList();
+    if ( groupsFromConfig.isEmpty() )
     {
-        cWarning() << "Using fallback groups. Please check *defaultGroups* in users.conf";
-        defaultGroups = QStringList { "lp", "video", "network", "storage", "wheel", "audio" };
+        if ( map.contains( key ) && map.value( key ).isValid() && map.value( key ).canConvert( QVariant::List ) )
+        {
+            // Explicitly set, but empty: this is valid, but unusual.
+            cDebug() << key << "has explicit empty value.";
+        }
+        else
+        {
+            cWarning() << "Using fallback groups. Please check *defaultGroups* value in users.conf";
+            for ( const auto& s : { "lp", "video", "network", "storage", "wheel", "audio" } )
+            {
+                defaultGroups.append( GroupDescription( s ) );
+            }
+        }
+    }
+    else
+    {
+        for ( const auto& v : groupsFromConfig )
+        {
+            if ( v.type() == QVariant::String )
+            {
+                defaultGroups.append( GroupDescription( v.toString() ) );
+            }
+            else
+            {
+                cWarning() << "Unknown *defaultGroups* entry" << v;
+            }
+        }
     }
-#endif
 }
 
 STATICTEST HostNameActions

From b20c80a28c6221f921046aebfe7cba034fe5f490 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 13 Oct 2020 22:58:02 +0200
Subject: [PATCH 004/228] [users] Introduce class-scoped aliases for true and
 false for the bools

This is somewhat experimental and weird; the idea is that bool
arguments are a lot easier to understand if there are proper
names attached, rather than "true" and "false".
---
 src/modules/users/Config.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h
index 384575ed4..853d65b5f 100644
--- a/src/modules/users/Config.h
+++ b/src/modules/users/Config.h
@@ -40,11 +40,17 @@ const NamedEnumTable< HostNameAction >& hostNameActionNames();
 class GroupDescription
 {
 public:
+    // TODO: still too-weakly typed, add a macro to define strongly-typed bools
+    class MustExist : public std::true_type {};
+    class CreateIfNeeded : public std::false_type {};
+    class SystemGroup : public std::true_type {};
+    class UserGroup : public std::false_type {};
+
     ///@brief An invalid, empty group
     GroupDescription() {}
 
     ///@brief A group with full details
-    GroupDescription( const QString& name, bool mustExistAlready = false, bool isSystem = false )
+    GroupDescription( const QString& name, bool mustExistAlready = CreateIfNeeded{}, bool isSystem = UserGroup{} )
         : m_name( name )
         , m_isValid( !name.isEmpty() )
         , m_mustAlreadyExist( mustExistAlready )

From ff9abdfc08f71386a4b48d3a89e3e01d77616fc2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 13 Oct 2020 22:58:30 +0200
Subject: [PATCH 005/228] [users] The fallback groups are all **system** groups

---
 src/modules/users/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 73465edc2..45b273a46 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -608,7 +608,7 @@ setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription >
             cWarning() << "Using fallback groups. Please check *defaultGroups* value in users.conf";
             for ( const auto& s : { "lp", "video", "network", "storage", "wheel", "audio" } )
             {
-                defaultGroups.append( GroupDescription( s ) );
+                defaultGroups.append( GroupDescription( s, GroupDescription::CreateIfNeeded{}, GroupDescription::SystemGroup{} ) );
             }
         }
     }

From 07027c24304ac7cb9ce8cb7563f4e050a9682baa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 13 Oct 2020 23:00:12 +0200
Subject: [PATCH 006/228] [users] Test distinguishes system groups from user
 groups

---
 src/modules/users/Tests.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index ac3a03446..6df215e02 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -95,7 +95,7 @@ UserTests::testDefaultGroups()
         QVERIFY( groups.isEmpty() );
         setConfigurationDefaultGroups( missing, groups );
         QCOMPARE( groups.count(), 6 );  // because of fallback!
-        QVERIFY( groups.contains( GroupDescription( "lp" ) ) );
+        QVERIFY( groups.contains( GroupDescription( "lp", false, GroupDescription::SystemGroup{} ) ) );
     }
 
     {
@@ -105,7 +105,7 @@ UserTests::testDefaultGroups()
         typeMismatch.insert( "defaultGroups", 1 );
         setConfigurationDefaultGroups( typeMismatch, groups );
         QCOMPARE( groups.count(), 6 );  // because of fallback!
-        QVERIFY( groups.contains( GroupDescription( "lp" ) ) );
+        QVERIFY( groups.contains( GroupDescription( "lp", false, GroupDescription::SystemGroup{} ) ) );
     }
 }
 

From a86374386b18b617a7848dfcfe803678e7ea4e83 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 13 Oct 2020 23:13:23 +0200
Subject: [PATCH 007/228] [users] Add test for new notation for
 groups-with-details

---
 src/modules/users/Tests.cpp               |  1 +
 src/modules/users/tests/5-issue-1523.conf | 14 ++++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 src/modules/users/tests/5-issue-1523.conf

diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index 6df215e02..1716034fc 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -119,6 +119,7 @@ UserTests::testDefaultGroupsYAML_data()
     QTest::newRow( "users.conf" ) << "users.conf" << 7 << "video";
     QTest::newRow( "dashed list" ) << "tests/4-audio.conf" << 4 << "audio";
     QTest::newRow( "blocked list" ) << "tests/3-wing.conf" << 3 << "wing";
+    QTest::newRow( "issue 1523" ) << "tests/5-issue-1523.conf" << 4 << "foobar";
 }
 
 void
diff --git a/src/modules/users/tests/5-issue-1523.conf b/src/modules/users/tests/5-issue-1523.conf
new file mode 100644
index 000000000..a0c5e49ba
--- /dev/null
+++ b/src/modules/users/tests/5-issue-1523.conf
@@ -0,0 +1,14 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
+---
+defaultGroups:
+  - adm
+  -   name: foo
+      must_exist: false
+      system: true
+  -   name: bar
+      must_exist: true
+  -   name: foobar
+      must_exist: false
+      system: false

From 02e9872a9994a3a79c18b05e98fd4f0f4eb6a34f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 13 Oct 2020 23:30:28 +0200
Subject: [PATCH 008/228] [users] Handle detailed groups list

Groups can be specified with must_exist and/or system set,
so they fill in the groups list more carefully.
---
 src/modules/users/Config.cpp | 20 +++++++++++++++++++-
 src/modules/users/Config.h   | 18 +++++++++++++-----
 src/modules/users/Tests.cpp  |  4 ++--
 3 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 45b273a46..d764df846 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -605,10 +605,13 @@ setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription >
         }
         else
         {
+            // By default give the user a handful of "traditional" groups, if
+            // none are specified at all. These are system (GID < 1000) groups.
             cWarning() << "Using fallback groups. Please check *defaultGroups* value in users.conf";
             for ( const auto& s : { "lp", "video", "network", "storage", "wheel", "audio" } )
             {
-                defaultGroups.append( GroupDescription( s, GroupDescription::CreateIfNeeded{}, GroupDescription::SystemGroup{} ) );
+                defaultGroups.append(
+                    GroupDescription( s, GroupDescription::CreateIfNeeded {}, GroupDescription::SystemGroup {} ) );
             }
         }
     }
@@ -620,6 +623,21 @@ setConfigurationDefaultGroups( const QVariantMap& map, QList< GroupDescription >
             {
                 defaultGroups.append( GroupDescription( v.toString() ) );
             }
+            else if ( v.type() == QVariant::Map )
+            {
+                const auto innermap = v.toMap();
+                QString name = CalamaresUtils::getString( innermap, "name" );
+                if ( !name.isEmpty() )
+                {
+                    defaultGroups.append( GroupDescription( name,
+                                                            CalamaresUtils::getBool( innermap, "must_exist", false ),
+                                                            CalamaresUtils::getBool( innermap, "system", false ) ) );
+                }
+                else
+                {
+                    cWarning() << "Ignoring *defaultGroups* entry without a name" << v;
+                }
+            }
             else
             {
                 cWarning() << "Unknown *defaultGroups* entry" << v;
diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h
index 853d65b5f..04f37d231 100644
--- a/src/modules/users/Config.h
+++ b/src/modules/users/Config.h
@@ -41,16 +41,24 @@ class GroupDescription
 {
 public:
     // TODO: still too-weakly typed, add a macro to define strongly-typed bools
-    class MustExist : public std::true_type {};
-    class CreateIfNeeded : public std::false_type {};
-    class SystemGroup : public std::true_type {};
-    class UserGroup : public std::false_type {};
+    class MustExist : public std::true_type
+    {
+    };
+    class CreateIfNeeded : public std::false_type
+    {
+    };
+    class SystemGroup : public std::true_type
+    {
+    };
+    class UserGroup : public std::false_type
+    {
+    };
 
     ///@brief An invalid, empty group
     GroupDescription() {}
 
     ///@brief A group with full details
-    GroupDescription( const QString& name, bool mustExistAlready = CreateIfNeeded{}, bool isSystem = UserGroup{} )
+    GroupDescription( const QString& name, bool mustExistAlready = CreateIfNeeded {}, bool isSystem = UserGroup {} )
         : m_name( name )
         , m_isValid( !name.isEmpty() )
         , m_mustAlreadyExist( mustExistAlready )
diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index 1716034fc..0ffeeae51 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -95,7 +95,7 @@ UserTests::testDefaultGroups()
         QVERIFY( groups.isEmpty() );
         setConfigurationDefaultGroups( missing, groups );
         QCOMPARE( groups.count(), 6 );  // because of fallback!
-        QVERIFY( groups.contains( GroupDescription( "lp", false, GroupDescription::SystemGroup{} ) ) );
+        QVERIFY( groups.contains( GroupDescription( "lp", false, GroupDescription::SystemGroup {} ) ) );
     }
 
     {
@@ -105,7 +105,7 @@ UserTests::testDefaultGroups()
         typeMismatch.insert( "defaultGroups", 1 );
         setConfigurationDefaultGroups( typeMismatch, groups );
         QCOMPARE( groups.count(), 6 );  // because of fallback!
-        QVERIFY( groups.contains( GroupDescription( "lp", false, GroupDescription::SystemGroup{} ) ) );
+        QVERIFY( groups.contains( GroupDescription( "lp", false, GroupDescription::SystemGroup {} ) ) );
     }
 }
 

From ef70b2c32e2692ecb7907067ca9d93c29e0e8a14 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 14 Oct 2020 00:23:00 +0200
Subject: [PATCH 009/228] [users] Run CreateUserJob off of the Config object

- don't pass in copies or bits of the Config, hand over the whole Config
- don't pluck some parts of the Config from Global Storage
---
 src/modules/users/Config.cpp        |  8 +----
 src/modules/users/CreateUserJob.cpp | 56 ++++++++++++++++-------------
 src/modules/users/CreateUserJob.h   |  9 ++---
 3 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index d764df846..b3d94666a 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -780,13 +780,7 @@ Config::createJobs() const
 
     Calamares::Job* j;
 
-    QStringList groupNames = std::accumulate(
-        m_defaultGroups.begin(),
-        m_defaultGroups.end(),
-        QStringList(),
-        []( const QStringList& l, const GroupDescription& g ) { return QStringList( l ) << g.name(); } );
-
-    j = new CreateUserJob( loginName(), fullName().isEmpty() ? loginName() : fullName(), doAutoLogin(), groupNames );
+    j = new CreateUserJob( this );
     jobs.append( Calamares::job_ptr( j ) );
 
     j = new SetPasswordJob( loginName(), userPassword() );
diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
index 24b0f36d1..2bdb6296a 100644
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@@ -7,6 +7,8 @@
 
 #include "CreateUserJob.h"
 
+#include "Config.h"
+
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "utils/CalamaresUtilsSystem.h"
@@ -21,15 +23,9 @@
 #include <QTextStream>
 
 
-CreateUserJob::CreateUserJob( const QString& userName,
-                              const QString& fullName,
-                              bool autologin,
-                              const QStringList& defaultGroups )
+CreateUserJob::CreateUserJob( const Config* config )
     : Calamares::Job()
-    , m_userName( userName )
-    , m_fullName( fullName )
-    , m_autologin( autologin )
-    , m_defaultGroups( defaultGroups )
+    , m_config( config )
 {
 }
 
@@ -37,21 +33,21 @@ CreateUserJob::CreateUserJob( const QString& userName,
 QString
 CreateUserJob::prettyName() const
 {
-    return tr( "Create user %1" ).arg( m_userName );
+    return tr( "Create user %1" ).arg( m_config->loginName() );
 }
 
 
 QString
 CreateUserJob::prettyDescription() const
 {
-    return tr( "Create user <strong>%1</strong>." ).arg( m_userName );
+    return tr( "Create user <strong>%1</strong>." ).arg( m_config->loginName() );
 }
 
 
 QString
 CreateUserJob::prettyStatusMessage() const
 {
-    return tr( "Creating user %1." ).arg( m_userName );
+    return tr( "Creating user %1." ).arg( m_config->loginName() );
 }
 
 STATICTEST QStringList
@@ -86,16 +82,16 @@ groupsInTargetSystem( const QDir& targetRoot )
 }
 
 static void
-ensureGroupsExistInTarget( const QStringList& wantedGroups, const QStringList& availableGroups )
+ensureGroupsExistInTarget( const QList< GroupDescription >& wantedGroups, const QStringList& availableGroups )
 {
-    for ( const QString& group : wantedGroups )
+    for ( const auto& group : wantedGroups )
     {
-        if ( !availableGroups.contains( group ) )
+        if ( group.isValid() && !availableGroups.contains( group.name() ) )
         {
 #ifdef __FreeBSD__
-            CalamaresUtils::System::instance()->targetEnvCall( { "pw", "groupadd", "-n", group } );
+            CalamaresUtils::System::instance()->targetEnvCall( { "pw", "groupadd", "-n", group.name() } );
 #else
-            CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", group } );
+            CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", group.name() } );
 #endif
         }
     }
@@ -189,19 +185,29 @@ CreateUserJob::exec()
 
     cDebug() << "[CREATEUSER]: preparing groups";
 
+    // loginName(), fullName().isEmpty() ? loginName() : fullName(), doAutoLogin(), groupNames );
+    const auto& defaultGroups = m_config->defaultGroups();
+    QStringList groupsForThisUser = std::accumulate(
+        defaultGroups.begin(),
+        defaultGroups.end(),
+        QStringList(),
+        []( const QStringList& l, const GroupDescription& g ) { return QStringList( l ) << g.name(); } );
+
     QStringList availableGroups = groupsInTargetSystem( destDir );
-    QStringList groupsForThisUser = m_defaultGroups;
-    if ( m_autologin && gs->contains( "autologinGroup" ) && !gs->value( "autologinGroup" ).toString().isEmpty() )
+    ensureGroupsExistInTarget( defaultGroups, availableGroups );
+
+    if ( m_config->doAutoLogin() && !m_config->autologinGroup().isEmpty() )
     {
-        groupsForThisUser << gs->value( "autologinGroup" ).toString();
+        const QString autologinGroup = m_config->autologinGroup();
+        groupsForThisUser << autologinGroup;
+        ensureGroupsExistInTarget( QList< GroupDescription >() << GroupDescription( autologinGroup ), availableGroups );
     }
-    ensureGroupsExistInTarget( groupsForThisUser, availableGroups );
 
     // If we're looking to reuse the contents of an existing /home.
     // This GS setting comes from the **partitioning** module.
     if ( gs->value( "reuseHome" ).toBool() )
     {
-        QString shellFriendlyHome = "/home/" + m_userName;
+        QString shellFriendlyHome = "/home/" + m_config->loginName();
         QDir existingHome( destDir.absolutePath() + shellFriendlyHome );
         if ( existingHome.exists() )
         {
@@ -216,20 +222,20 @@ CreateUserJob::exec()
 
     cDebug() << "[CREATEUSER]: creating user";
 
-    auto useraddResult = createUser( m_userName, m_fullName, gs->value( "userShell" ).toString() );
+    auto useraddResult = createUser( m_config->loginName(), m_config->fullName(), m_config->userShell() );
     if ( !useraddResult )
     {
         return useraddResult;
     }
 
-    auto usergroupsResult = setUserGroups( m_userName, groupsForThisUser );
+    auto usergroupsResult = setUserGroups( m_config->loginName(), groupsForThisUser );
     if ( !usergroupsResult )
     {
         return usergroupsResult;
     }
 
-    QString userGroup = QString( "%1:%2" ).arg( m_userName ).arg( m_userName );
-    QString homeDir = QString( "/home/%1" ).arg( m_userName );
+    QString userGroup = QString( "%1:%2" ).arg( m_config->loginName() ).arg( m_config->loginName() );
+    QString homeDir = QString( "/home/%1" ).arg( m_config->loginName() );
     auto commandResult = CalamaresUtils::System::instance()->targetEnvCommand( { "chown", "-R", userGroup, homeDir } );
     if ( commandResult.getExitCode() )
     {
diff --git a/src/modules/users/CreateUserJob.h b/src/modules/users/CreateUserJob.h
index 0a46198b9..0bc140bff 100644
--- a/src/modules/users/CreateUserJob.h
+++ b/src/modules/users/CreateUserJob.h
@@ -12,23 +12,20 @@
 
 #include "Job.h"
 
-#include <QStringList>
+class Config;
 
 class CreateUserJob : public Calamares::Job
 {
     Q_OBJECT
 public:
-    CreateUserJob( const QString& userName, const QString& fullName, bool autologin, const QStringList& defaultGroups );
+    CreateUserJob( const Config* config );
     QString prettyName() const override;
     QString prettyDescription() const override;
     QString prettyStatusMessage() const override;
     Calamares::JobResult exec() override;
 
 private:
-    QString m_userName;
-    QString m_fullName;
-    bool m_autologin;
-    QStringList m_defaultGroups;
+    const Config* m_config;
 };
 
 #endif /* CREATEUSERJOB_H */

From 58f10739e110c42a74670ea62b9262ce4588d3a3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 14 Oct 2020 00:55:00 +0200
Subject: [PATCH 010/228] [users] Show progress during the module

- add a status member so the different steps can show progress
  as the user is created and configured. The progress values
  are hard-coded guesses as to how much work is done for each step.
- while here, reduce the scope of the global storage variable
---
 src/modules/users/CreateUserJob.cpp | 30 +++++++++++++++++++++++------
 src/modules/users/CreateUserJob.h   |  1 +
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
index 2bdb6296a..c9830abd4 100644
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@@ -47,7 +47,7 @@ CreateUserJob::prettyDescription() const
 QString
 CreateUserJob::prettyStatusMessage() const
 {
-    return tr( "Creating user %1." ).arg( m_config->loginName() );
+    return m_status.isEmpty() ? tr( "Creating user %1." ).arg( m_config->loginName() ) : m_status;
 }
 
 STATICTEST QStringList
@@ -157,14 +157,22 @@ setUserGroups( const QString& loginName, const QStringList& groups )
 Calamares::JobResult
 CreateUserJob::exec()
 {
-    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-    QDir destDir( gs->value( "rootMountPoint" ).toString() );
+    QDir destDir;
+    bool reuseHome = false;
 
-    if ( gs->contains( "sudoersGroup" ) && !gs->value( "sudoersGroup" ).toString().isEmpty() )
     {
+        Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
+        destDir = QDir( gs->value( "rootMountPoint" ).toString() );
+        reuseHome = gs->value( "reuseHome" ).toBool();
+    }
+
+    if ( !m_config->sudoersGroup().isEmpty() )
+    {
+        m_status = tr( "Preparing sudo for user %1" ).arg( m_config->loginName() );
+        emit progress( 0.05 );
         cDebug() << "[CREATEUSER]: preparing sudoers";
 
-        QString sudoersLine = QString( "%%1 ALL=(ALL) ALL\n" ).arg( gs->value( "sudoersGroup" ).toString() );
+        QString sudoersLine = QString( "%%1 ALL=(ALL) ALL\n" ).arg( m_config->sudoersGroup() );
         auto fileResult
             = CalamaresUtils::System::instance()->createTargetFile( QStringLiteral( "/etc/sudoers.d/10-installer" ),
                                                                     sudoersLine.toUtf8().constData(),
@@ -185,6 +193,8 @@ CreateUserJob::exec()
 
     cDebug() << "[CREATEUSER]: preparing groups";
 
+    m_status = tr( "Preparing groups for user %1" ).arg( m_config->loginName() );
+    emit progress( 0.1 );
     // loginName(), fullName().isEmpty() ? loginName() : fullName(), doAutoLogin(), groupNames );
     const auto& defaultGroups = m_config->defaultGroups();
     QStringList groupsForThisUser = std::accumulate(
@@ -205,8 +215,10 @@ CreateUserJob::exec()
 
     // If we're looking to reuse the contents of an existing /home.
     // This GS setting comes from the **partitioning** module.
-    if ( gs->value( "reuseHome" ).toBool() )
+    if ( reuseHome )
     {
+        m_status = tr( "Preserving home directory" );
+        emit progress( 0.2 );
         QString shellFriendlyHome = "/home/" + m_config->loginName();
         QDir existingHome( destDir.absolutePath() + shellFriendlyHome );
         if ( existingHome.exists() )
@@ -222,18 +234,24 @@ CreateUserJob::exec()
 
     cDebug() << "[CREATEUSER]: creating user";
 
+    m_status = tr( "Creating user %1" ).arg( m_config->loginName() );
+    emit progress( 0.5 );
     auto useraddResult = createUser( m_config->loginName(), m_config->fullName(), m_config->userShell() );
     if ( !useraddResult )
     {
         return useraddResult;
     }
 
+    m_status = tr( "Configuring user %1" ).arg( m_config->loginName() );
+    emit progress( 0.8 );
     auto usergroupsResult = setUserGroups( m_config->loginName(), groupsForThisUser );
     if ( !usergroupsResult )
     {
         return usergroupsResult;
     }
 
+    m_status = tr( "Setting file permissions" );
+    emit progress( 0.9 );
     QString userGroup = QString( "%1:%2" ).arg( m_config->loginName() ).arg( m_config->loginName() );
     QString homeDir = QString( "/home/%1" ).arg( m_config->loginName() );
     auto commandResult = CalamaresUtils::System::instance()->targetEnvCommand( { "chown", "-R", userGroup, homeDir } );
diff --git a/src/modules/users/CreateUserJob.h b/src/modules/users/CreateUserJob.h
index 0bc140bff..28a48c886 100644
--- a/src/modules/users/CreateUserJob.h
+++ b/src/modules/users/CreateUserJob.h
@@ -26,6 +26,7 @@ public:
 
 private:
     const Config* m_config;
+    QString m_status;
 };
 
 #endif /* CREATEUSERJOB_H */

From 788a233319a1d5c143351098e9fb5709de0a8700 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 14 Oct 2020 01:10:48 +0200
Subject: [PATCH 011/228] [users] Introduce a test for Config getters and
 setters

---
 src/modules/users/Tests.cpp | 57 +++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index 0ffeeae51..e973868db 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -33,6 +33,9 @@ public:
 private Q_SLOTS:
     void initTestCase();
 
+    // Derpy test for getting and setting regular values
+    void testGetSet();
+
     void testDefaultGroups();
     void testDefaultGroupsYAML_data();
     void testDefaultGroupsYAML();
@@ -52,6 +55,60 @@ UserTests::initTestCase()
     cDebug() << "Users test started.";
 }
 
+void
+UserTests::testGetSet()
+{
+    Config c;
+
+    {
+        const QString sh( "/bin/sh" );
+        QCOMPARE( c.userShell(), QString() );
+        c.setUserShell( sh );
+        QCOMPARE( c.userShell(), sh );
+        c.setUserShell( sh + sh );
+        QCOMPARE( c.userShell(), sh + sh );
+
+        const QString badsh( "bash" );  // Not absolute, that's bad
+        c.setUserShell( badsh );
+        QEXPECT_FAIL( "", "Shell Unchanged", Abort );
+        QCOMPARE( c.userShell(), badsh );
+        QCOMPARE( c.userShell(), sh + sh );  // what was set previously
+
+        // Explicit set to empty is ok
+        c.setUserShell( QString() );
+        QCOMPARE( c.userShell(), QString() );
+    }
+    {
+        const QString al( "autolg" );
+        QCOMPARE( c.autologinGroup(), QString() );
+        c.setAutologinGroup( al );
+        QCOMPARE( c.autologinGroup(), al );
+        QVERIFY( !c.doAutoLogin() );
+        c.setAutoLogin( true );
+        QVERIFY( c.doAutoLogin() );
+        QCOMPARE( c.autologinGroup(), al );
+    }
+    {
+        const QString su( "sudogrp" );
+        QCOMPARE( c.sudoersGroup(), QString() );
+        c.setSudoersGroup( su );
+        QCOMPARE( c.sudoersGroup(), su );
+    }
+    {
+        const QString ful( "Jan-Jaap Karel Kees" );
+        const QString lg( "jjkk" );
+        QCOMPARE( c.fullName(), QString() );
+        QCOMPARE( c.loginName(), QString() );
+        QVERIFY( !c.loginNameStatus().isEmpty() );  // login name is not ok
+        c.setLoginName( lg );
+        c.setFullName( ful );
+        QVERIFY( c.loginNameStatus().isEmpty() );  // now it's ok
+        QCOMPARE( c.loginName(), lg );
+        QCOMPARE( c.fullName(), ful );
+    }
+}
+
+
 void
 UserTests::testDefaultGroups()
 {

From 6b2d7f6a4259cf575a5736749bd5789d0bfc7db8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 14 Oct 2020 01:15:16 +0200
Subject: [PATCH 012/228] [users] Protect against JobQueue or GS being NULL

- Avoid SIGSEGV in tests, make sure JobQueue exists, GS optional
---
 src/modules/users/Config.cpp | 5 +++++
 src/modules/users/Tests.cpp  | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index b3d94666a..da57db0fc 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -34,6 +34,11 @@ static void
 updateGSAutoLogin( bool doAutoLogin, const QString& login )
 {
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
+    if ( !gs )
+    {
+        cWarning() << "No Global Storage available";
+        return;
+    }
 
     if ( doAutoLogin && !login.isEmpty() )
     {
diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index e973868db..3d4aa8694 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -53,6 +53,11 @@ UserTests::initTestCase()
 {
     Logger::setupLogLevel( Logger::LOGDEBUG );
     cDebug() << "Users test started.";
+
+    if ( !Calamares::JobQueue::instance() )
+    {
+        (void)new Calamares::JobQueue();
+    }
 }
 
 void

From f726634c2fe6ba668648e961181108e4e0b1c48c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 14 Oct 2020 12:52:47 +0200
Subject: [PATCH 013/228] [users] Fix tests for setting shell

- The EXPECT_FAIL value "Abort" stops the test (I wanted 'if this
  unexpectedly passes, raise an error' -- should have read the
  documentation more closely).
- Set the shell in the config object, not just in GS.
---
 src/modules/users/Config.cpp | 13 +++++++++----
 src/modules/users/Tests.cpp  |  4 +---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index da57db0fc..e8d0192ee 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -100,11 +100,16 @@ Config::setUserShell( const QString& shell )
         cWarning() << "User shell" << shell << "is not an absolute path.";
         return;
     }
-    // The shell is put into GS because the CreateUser job expects it there
-    auto* gs = Calamares::JobQueue::instance()->globalStorage();
-    if ( gs )
+    if ( shell != m_userShell )
     {
-        gs->insert( "userShell", shell );
+        m_userShell = shell;
+        emit userShellChanged(shell);
+        // The shell is put into GS as well.
+        auto* gs = Calamares::JobQueue::instance()->globalStorage();
+        if ( gs )
+        {
+            gs->insert( "userShell", shell );
+        }
     }
 }
 
diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index 3d4aa8694..b1ec8ebbc 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -74,9 +74,7 @@ UserTests::testGetSet()
         QCOMPARE( c.userShell(), sh + sh );
 
         const QString badsh( "bash" );  // Not absolute, that's bad
-        c.setUserShell( badsh );
-        QEXPECT_FAIL( "", "Shell Unchanged", Abort );
-        QCOMPARE( c.userShell(), badsh );
+        c.setUserShell( badsh );  // .. so unchanged
         QCOMPARE( c.userShell(), sh + sh );  // what was set previously
 
         // Explicit set to empty is ok

From 89e279c96ad9af66b36a735d6de8d71bb8718321 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 14 Oct 2020 15:04:37 +0200
Subject: [PATCH 014/228] [users] Set auto- and sudo-groups correctly

- Was updating GS only, not internals
- restructure all to update internals, then GS, then emit change signals
---
 src/modules/users/Config.cpp | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index e8d0192ee..024661d8d 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -127,15 +127,23 @@ insertInGlobalStorage( const QString& key, const QString& group )
 void
 Config::setAutologinGroup( const QString& group )
 {
-    insertInGlobalStorage( QStringLiteral( "autologinGroup" ), group );
-    emit autologinGroupChanged( group );
+    if ( group != m_autologinGroup )
+    {
+        m_autologinGroup = group;
+        insertInGlobalStorage( QStringLiteral( "autologinGroup" ), group );
+        emit autologinGroupChanged( group );
+    }
 }
 
 void
 Config::setSudoersGroup( const QString& group )
 {
-    insertInGlobalStorage( QStringLiteral( "sudoersGroup" ), group );
-    emit sudoersGroupChanged( group );
+    if ( group != m_sudoersGroup )
+    {
+        m_sudoersGroup = group;
+        insertInGlobalStorage( QStringLiteral( "sudoersGroup" ), group );
+        emit sudoersGroupChanged( group );
+    }
 }
 
 
@@ -144,10 +152,9 @@ Config::setLoginName( const QString& login )
 {
     if ( login != m_loginName )
     {
-        updateGSAutoLogin( doAutoLogin(), login );
-
         m_customLoginName = !login.isEmpty();
         m_loginName = login;
+        updateGSAutoLogin( doAutoLogin(), login );
         emit loginNameChanged( login );
         emit loginNameStatusChanged( loginNameStatus() );
     }
@@ -199,6 +206,8 @@ Config::setHostName( const QString& host )
 {
     if ( host != m_hostName )
     {
+        m_customHostName = !host.isEmpty();
+        m_hostName = host;
         Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
         if ( host.isEmpty() )
         {
@@ -208,9 +217,6 @@ Config::setHostName( const QString& host )
         {
             gs->insert( "hostname", host );
         }
-
-        m_customHostName = !host.isEmpty();
-        m_hostName = host;
         emit hostNameChanged( host );
         emit hostNameStatusChanged( hostNameStatus() );
     }
@@ -379,8 +385,8 @@ Config::setAutoLogin( bool b )
 {
     if ( b != m_doAutoLogin )
     {
-        updateGSAutoLogin( b, loginName() );
         m_doAutoLogin = b;
+        updateGSAutoLogin( b, loginName() );
         emit autoLoginChanged( b );
     }
 }

From 2911c789f928d65307e315aaf2f58dd56d183ba5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 14 Oct 2020 15:15:47 +0200
Subject: [PATCH 015/228] [users] Fix up tests for login status

- an empty login name is "ok" even if it isn't -- there's no
  warning message in that case
---
 src/modules/users/Tests.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index b1ec8ebbc..5259fb8a8 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -102,12 +102,14 @@ UserTests::testGetSet()
         const QString lg( "jjkk" );
         QCOMPARE( c.fullName(), QString() );
         QCOMPARE( c.loginName(), QString() );
-        QVERIFY( !c.loginNameStatus().isEmpty() );  // login name is not ok
+        QVERIFY( c.loginNameStatus().isEmpty() );  // empty login name is ok
         c.setLoginName( lg );
         c.setFullName( ful );
-        QVERIFY( c.loginNameStatus().isEmpty() );  // now it's ok
+        QVERIFY( c.loginNameStatus().isEmpty() );  // now it's still ok
         QCOMPARE( c.loginName(), lg );
         QCOMPARE( c.fullName(), ful );
+        c.setLoginName( "root" );
+        QVERIFY( !c.loginNameStatus().isEmpty() );  // can't be root
     }
 }
 

From b54273f904d1dbe2c451657ad6ca3f56d93f647e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 12 Oct 2020 14:33:09 +0200
Subject: [PATCH 016/228] [keyboard] Move all the keyboard (AbstractList)Models
 to the models file

---
 src/modules/keyboard/Config.cpp              | 154 ------------------
 src/modules/keyboard/Config.h                |  57 -------
 src/modules/keyboard/KeyboardLayoutModel.cpp | 155 +++++++++++++++++++
 src/modules/keyboard/KeyboardLayoutModel.h   |  57 +++++++
 4 files changed, 212 insertions(+), 211 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 11a20bbb7..e5574f186 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -23,160 +23,6 @@
 #include <QProcess>
 #include <QTimer>
 
-KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
-    : QAbstractListModel( parent )
-{
-    detectModels();
-}
-
-void
-KeyboardModelsModel::detectModels()
-{
-    beginResetModel();
-    const auto models = KeyboardGlobal::getKeyboardModels();
-    auto index = -1;
-    for ( const auto& key : models.keys() )
-    {
-        index++;
-        m_list << QMap< QString, QString > { { "label", key }, { "key", models[ key ] } };
-        if ( models[ key ] == "pc105" )
-        {
-            this->setCurrentIndex( index );
-        }
-    }
-    endResetModel();
-}
-
-void
-KeyboardModelsModel::refresh()
-{
-    m_list.clear();
-    setCurrentIndex( -1 );
-    detectModels();
-}
-
-QVariant
-KeyboardModelsModel::data( const QModelIndex& index, int role ) const
-{
-    if ( !index.isValid() )
-    {
-        return QVariant();
-    }
-    const auto item = m_list.at( index.row() );
-    return role == Qt::DisplayRole ? item[ "label" ] : item[ "key" ];
-}
-
-int
-KeyboardModelsModel::rowCount( const QModelIndex& ) const
-{
-    return m_list.count();
-}
-
-QHash< int, QByteArray >
-KeyboardModelsModel::roleNames() const
-{
-    return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
-}
-
-int
-KeyboardModelsModel::currentIndex() const
-{
-    return m_currentIndex;
-}
-
-const QMap< QString, QString >
-KeyboardModelsModel::item( const int& index ) const
-{
-    if ( index >= m_list.count() || index < 0 )
-    {
-        return QMap< QString, QString >();
-    }
-
-    return m_list.at( index );
-}
-
-const QMap< QString, QString >
-KeyboardVariantsModel::item( const int& index ) const
-{
-    if ( index >= m_list.count() || index < 0 )
-    {
-        return QMap< QString, QString >();
-    }
-
-    return m_list.at( index );
-}
-
-void
-KeyboardModelsModel::setCurrentIndex( const int& index )
-{
-    if ( index >= m_list.count() || index < 0 )
-    {
-        return;
-    }
-
-    m_currentIndex = index;
-    emit currentIndexChanged( m_currentIndex );
-}
-
-KeyboardVariantsModel::KeyboardVariantsModel( QObject* parent )
-    : QAbstractListModel( parent )
-{
-}
-
-int
-KeyboardVariantsModel::currentIndex() const
-{
-    return m_currentIndex;
-}
-
-void
-KeyboardVariantsModel::setCurrentIndex( const int& index )
-{
-    if ( index >= m_list.count() || index < 0 )
-    {
-        return;
-    }
-
-    m_currentIndex = index;
-    emit currentIndexChanged( m_currentIndex );
-}
-
-QVariant
-KeyboardVariantsModel::data( const QModelIndex& index, int role ) const
-{
-    if ( !index.isValid() )
-    {
-        return QVariant();
-    }
-    const auto item = m_list.at( index.row() );
-    return role == Qt::DisplayRole ? item[ "label" ] : item[ "key" ];
-}
-
-int
-KeyboardVariantsModel::rowCount( const QModelIndex& ) const
-{
-    return m_list.count();
-}
-
-QHash< int, QByteArray >
-KeyboardVariantsModel::roleNames() const
-{
-    return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
-}
-
-void
-KeyboardVariantsModel::setVariants( QMap< QString, QString > variants )
-{
-    m_list.clear();
-    beginResetModel();
-    for ( const auto& key : variants.keys() )
-    {
-        const auto item = QMap< QString, QString > { { "label", key }, { "key", variants[ key ] } };
-        m_list << item;
-    }
-    endResetModel();
-}
-
 /* Returns stringlist with suitable setxkbmap command-line arguments
  * to set the given @p layout and @p variant.
  */
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index 44a893faa..f02c08877 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -20,63 +20,6 @@
 #include <QTimer>
 #include <QUrl>
 
-class KeyboardModelsModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY( int currentIndex WRITE setCurrentIndex READ currentIndex NOTIFY currentIndexChanged )
-
-public:
-    explicit KeyboardModelsModel( QObject* parent = nullptr );
-    int rowCount( const QModelIndex& = QModelIndex() ) const override;
-    QVariant data( const QModelIndex& index, int role ) const override;
-
-    void setCurrentIndex( const int& index );
-    int currentIndex() const;
-    const QMap< QString, QString > item( const int& index ) const;
-
-public slots:
-    void refresh();
-
-protected:
-    QHash< int, QByteArray > roleNames() const override;
-
-private:
-    int m_currentIndex = -1;
-    QVector< QMap< QString, QString > > m_list;
-    void detectModels();
-
-signals:
-    void currentIndexChanged( int index );
-};
-
-class KeyboardVariantsModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY( int currentIndex WRITE setCurrentIndex READ currentIndex NOTIFY currentIndexChanged )
-
-public:
-    explicit KeyboardVariantsModel( QObject* parent = nullptr );
-    void setVariants( QMap< QString, QString > variants );
-
-    int rowCount( const QModelIndex& = QModelIndex() ) const override;
-    QVariant data( const QModelIndex& index, int role ) const override;
-
-    void setCurrentIndex( const int& index );
-    int currentIndex() const;
-
-    const QMap< QString, QString > item( const int& index ) const;
-
-protected:
-    QHash< int, QByteArray > roleNames() const override;
-
-private:
-    int m_currentIndex = -1;
-    QVector< QMap< QString, QString > > m_list;
-
-signals:
-    void currentIndexChanged( int index );
-};
-
 class Config : public QObject
 {
     Q_OBJECT
diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 5b92678f6..2a4ffa4d6 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -99,3 +99,158 @@ KeyboardLayoutModel::currentIndex() const
 {
     return m_currentIndex;
 }
+
+KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
+    : QAbstractListModel( parent )
+{
+    detectModels();
+}
+
+void
+KeyboardModelsModel::detectModels()
+{
+    beginResetModel();
+    const auto models = KeyboardGlobal::getKeyboardModels();
+    auto index = -1;
+    for ( const auto& key : models.keys() )
+    {
+        index++;
+        m_list << QMap< QString, QString > { { "label", key }, { "key", models[ key ] } };
+        if ( models[ key ] == "pc105" )
+        {
+            this->setCurrentIndex( index );
+        }
+    }
+    endResetModel();
+}
+
+void
+KeyboardModelsModel::refresh()
+{
+    m_list.clear();
+    setCurrentIndex( -1 );
+    detectModels();
+}
+
+QVariant
+KeyboardModelsModel::data( const QModelIndex& index, int role ) const
+{
+    if ( !index.isValid() )
+    {
+        return QVariant();
+    }
+    const auto item = m_list.at( index.row() );
+    return role == Qt::DisplayRole ? item[ "label" ] : item[ "key" ];
+}
+
+int
+KeyboardModelsModel::rowCount( const QModelIndex& ) const
+{
+    return m_list.count();
+}
+
+QHash< int, QByteArray >
+KeyboardModelsModel::roleNames() const
+{
+    return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
+}
+
+int
+KeyboardModelsModel::currentIndex() const
+{
+    return m_currentIndex;
+}
+
+const QMap< QString, QString >
+KeyboardModelsModel::item( const int& index ) const
+{
+    if ( index >= m_list.count() || index < 0 )
+    {
+        return QMap< QString, QString >();
+    }
+
+    return m_list.at( index );
+}
+
+const QMap< QString, QString >
+KeyboardVariantsModel::item( const int& index ) const
+{
+    if ( index >= m_list.count() || index < 0 )
+    {
+        return QMap< QString, QString >();
+    }
+
+    return m_list.at( index );
+}
+
+void
+KeyboardModelsModel::setCurrentIndex( const int& index )
+{
+    if ( index >= m_list.count() || index < 0 )
+    {
+        return;
+    }
+
+    m_currentIndex = index;
+    emit currentIndexChanged( m_currentIndex );
+}
+
+KeyboardVariantsModel::KeyboardVariantsModel( QObject* parent )
+    : QAbstractListModel( parent )
+{
+}
+
+int
+KeyboardVariantsModel::currentIndex() const
+{
+    return m_currentIndex;
+}
+
+void
+KeyboardVariantsModel::setCurrentIndex( const int& index )
+{
+    if ( index >= m_list.count() || index < 0 )
+    {
+        return;
+    }
+
+    m_currentIndex = index;
+    emit currentIndexChanged( m_currentIndex );
+}
+
+QVariant
+KeyboardVariantsModel::data( const QModelIndex& index, int role ) const
+{
+    if ( !index.isValid() )
+    {
+        return QVariant();
+    }
+    const auto item = m_list.at( index.row() );
+    return role == Qt::DisplayRole ? item[ "label" ] : item[ "key" ];
+}
+
+int
+KeyboardVariantsModel::rowCount( const QModelIndex& ) const
+{
+    return m_list.count();
+}
+
+QHash< int, QByteArray >
+KeyboardVariantsModel::roleNames() const
+{
+    return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
+}
+
+void
+KeyboardVariantsModel::setVariants( QMap< QString, QString > variants )
+{
+    m_list.clear();
+    beginResetModel();
+    for ( const auto& key : variants.keys() )
+    {
+        const auto item = QMap< QString, QString > { { "label", key }, { "key", variants[ key ] } };
+        m_list << item;
+    }
+    endResetModel();
+}
+
diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index f4699c9f8..0fd662263 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -51,4 +51,61 @@ signals:
     void currentIndexChanged( int index );
 };
 
+class KeyboardModelsModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY( int currentIndex WRITE setCurrentIndex READ currentIndex NOTIFY currentIndexChanged )
+
+public:
+    explicit KeyboardModelsModel( QObject* parent = nullptr );
+    int rowCount( const QModelIndex& = QModelIndex() ) const override;
+    QVariant data( const QModelIndex& index, int role ) const override;
+
+    void setCurrentIndex( const int& index );
+    int currentIndex() const;
+    const QMap< QString, QString > item( const int& index ) const;
+
+public slots:
+    void refresh();
+
+protected:
+    QHash< int, QByteArray > roleNames() const override;
+
+private:
+    int m_currentIndex = -1;
+    QVector< QMap< QString, QString > > m_list;
+    void detectModels();
+
+signals:
+    void currentIndexChanged( int index );
+};
+
+class KeyboardVariantsModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY( int currentIndex WRITE setCurrentIndex READ currentIndex NOTIFY currentIndexChanged )
+
+public:
+    explicit KeyboardVariantsModel( QObject* parent = nullptr );
+    void setVariants( QMap< QString, QString > variants );
+
+    int rowCount( const QModelIndex& = QModelIndex() ) const override;
+    QVariant data( const QModelIndex& index, int role ) const override;
+
+    void setCurrentIndex( const int& index );
+    int currentIndex() const;
+
+    const QMap< QString, QString > item( const int& index ) const;
+
+protected:
+    QHash< int, QByteArray > roleNames() const override;
+
+private:
+    int m_currentIndex = -1;
+    QVector< QMap< QString, QString > > m_list;
+
+signals:
+    void currentIndexChanged( int index );
+};
+
 #endif  // KEYBOARDLAYOUTMODEL_H

From ec42e3294fdd707b897c2700cb481f0c5bebd18e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 12 Oct 2020 14:37:00 +0200
Subject: [PATCH 017/228] [keyboard] Refactor argument-lists for setxkbmap

- separate functions for model, and layout+variant settings
---
 src/modules/keyboard/Config.cpp | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index e5574f186..10ad49b21 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -23,11 +23,22 @@
 #include <QProcess>
 #include <QTimer>
 
+/* Returns stringlist with suitable setxkbmap command-line arguments
+ * to set the given @p model.
+ */
+static inline QStringList
+xkbmap_model_args( const QString& model )
+{
+    QStringList r { "-model", model };
+    return r;
+}
+
+
 /* Returns stringlist with suitable setxkbmap command-line arguments
  * to set the given @p layout and @p variant.
  */
 static inline QStringList
-xkbmap_args( const QString& layout, const QString& variant )
+xkbmap_layout_args( const QString& layout, const QString& variant )
 {
     QStringList r { "-layout", layout };
     if ( !variant.isEmpty() )
@@ -49,7 +60,7 @@ Config::Config( QObject* parent )
     connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, [&]( int index ) {
         m_selectedModel = m_keyboardModelsModel->item( index ).value( "key", "pc105" );
         //                      Set Xorg keyboard model
-        QProcess::execute( "setxkbmap", QStringList { "-model", m_selectedModel } );
+        QProcess::execute( "setxkbmap", xkbmap_model_args( m_selectedModel ) );
         emit prettyStatusChanged();
     } );
 
@@ -70,7 +81,7 @@ Config::Config( QObject* parent )
         }
 
         connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
-            QProcess::execute( "setxkbmap", xkbmap_args( m_selectedLayout, m_selectedVariant ) );
+            QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
             cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
             m_setxkbmapTimer.disconnect( this );
         } );

From 0f6602cad7d180098d37f3bd4cb587103b59bd7d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 12 Oct 2020 15:58:26 +0200
Subject: [PATCH 018/228] [keyboard] Improve xkb parsing

---
 src/modules/keyboard/Config.cpp | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 10ad49b21..403f696a9 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -138,18 +138,25 @@ Config::init()
     {
         const QStringList list = QString( process.readAll() ).split( "\n", SplitSkipEmptyParts );
 
-        for ( QString line : list )
+        // A typical line looks like
+        //      xkb_symbols   { include "pc+latin+ru:2+inet(evdev)+group(alt_shift_toggle)+ctrl(swapcaps)"       };
+        for ( const auto& line : list )
         {
-            line = line.trimmed();
-            if ( !line.startsWith( "xkb_symbols" ) )
+            if ( !line.trimmed().startsWith( "xkb_symbols" ) )
             {
                 continue;
             }
 
-            line = line.remove( "}" ).remove( "{" ).remove( ";" );
-            line = line.mid( line.indexOf( "\"" ) + 1 );
+            int firstQuote = line.indexOf('"');
+            int lastQuote = line.lastIndexOf('"');
 
-            QStringList split = line.split( "+", SplitSkipEmptyParts );
+            if (firstQuote < 0 || lastQuote < 0 || lastQuote <= firstQuote)
+            {
+                continue;
+            }
+
+            QStringList split = line.mid(firstQuote+1, lastQuote-firstQuote).split( "+", SplitSkipEmptyParts );
+            cDebug() << split;
             if ( split.size() >= 2 )
             {
                 currentLayout = split.at( 1 );

From c7c7e6a6c14d8e73fc1f0234613aee66775955c9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 12 Oct 2020 16:30:06 +0200
Subject: [PATCH 019/228] [keyboard] Move configuration to the Config object

- information from the configuration file -> Config object
- job creation -> Config object

Ignore keyboardq for now.
---
 src/modules/keyboard/CMakeLists.txt           |  1 +
 src/modules/keyboard/Config.cpp               | 47 +++++++++++++++++--
 src/modules/keyboard/Config.h                 | 11 ++++-
 src/modules/keyboard/KeyboardViewStep.cpp     | 42 ++---------------
 src/modules/keyboard/KeyboardViewStep.h       |  8 +---
 src/modules/keyboardq/KeyboardQmlViewStep.cpp |  2 +-
 6 files changed, 60 insertions(+), 51 deletions(-)

diff --git a/src/modules/keyboard/CMakeLists.txt b/src/modules/keyboard/CMakeLists.txt
index e9037bc03..32e9a0592 100644
--- a/src/modules/keyboard/CMakeLists.txt
+++ b/src/modules/keyboard/CMakeLists.txt
@@ -7,6 +7,7 @@ calamares_add_plugin( keyboard
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
+        Config.cpp
         KeyboardViewStep.cpp
         KeyboardPage.cpp
         KeyboardLayoutModel.cpp
diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 403f696a9..7f7eb7b27 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -18,6 +18,7 @@
 #include "utils/Logger.h"
 #include "utils/Retranslator.h"
 #include "utils/String.h"
+#include "utils/Variant.h"
 
 #include <QApplication>
 #include <QProcess>
@@ -214,16 +215,16 @@ Config::prettyStatus() const
 }
 
 Calamares::JobList
-Config::createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard )
+Config::createJobs()
 {
     QList< Calamares::job_ptr > list;
 
     Calamares::Job* j = new SetKeyboardLayoutJob( m_selectedModel,
                                                   m_selectedLayout,
                                                   m_selectedVariant,
-                                                  xOrgConfFileName,
-                                                  convertedKeymapPath,
-                                                  writeEtcDefaultKeyboard );
+                                                  m_xOrgConfFileName,
+                                                  m_convertedKeymapPath,
+                                                  m_writeEtcDefaultKeyboard );
     list.append( Calamares::job_ptr( j ) );
 
     return list;
@@ -393,3 +394,41 @@ Config::updateVariants( const QPersistentModelIndex& currentItem, QString curren
         }
     }
 }
+
+void
+Config::setConfigurationMap( const QVariantMap& configurationMap )
+{
+    using namespace CalamaresUtils;
+
+    if ( configurationMap.contains( "xOrgConfFileName" )
+         && configurationMap.value( "xOrgConfFileName" ).type() == QVariant::String
+         && !getString( configurationMap, "xOrgConfFileName" ).isEmpty() )
+    {
+        m_xOrgConfFileName = getString( configurationMap, "xOrgConfFileName" );
+    }
+    else
+    {
+        m_xOrgConfFileName = "00-keyboard.conf";
+    }
+
+    if ( configurationMap.contains( "convertedKeymapPath" )
+         && configurationMap.value( "convertedKeymapPath" ).type() == QVariant::String
+         && !getString( configurationMap, "convertedKeymapPath" ).isEmpty() )
+    {
+        m_convertedKeymapPath = getString( configurationMap, "convertedKeymapPath" );
+    }
+    else
+    {
+        m_convertedKeymapPath = QString();
+    }
+
+    if ( configurationMap.contains( "writeEtcDefaultKeyboard" )
+         && configurationMap.value( "writeEtcDefaultKeyboard" ).type() == QVariant::Bool )
+    {
+        m_writeEtcDefaultKeyboard = getBool( configurationMap, "writeEtcDefaultKeyboard", true );
+    }
+    else
+    {
+        m_writeEtcDefaultKeyboard = true;
+    }
+}
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index f02c08877..9a3a3a013 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -33,13 +33,14 @@ public:
 
     void init();
 
-    Calamares::JobList
-    createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
+    Calamares::JobList createJobs();
     QString prettyStatus() const;
 
     void onActivate();
     void finalize();
 
+    void setConfigurationMap( const QVariantMap& configurationMap );
+
 private:
     void guessLayout( const QStringList& langParts );
     void updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant = QString() );
@@ -53,6 +54,12 @@ private:
     QString m_selectedVariant;
     QTimer m_setxkbmapTimer;
 
+    // From configuration
+    QString m_xOrgConfFileName;
+    QString m_convertedKeymapPath;
+    bool m_writeEtcDefaultKeyboard = true;
+
+
 protected:
     KeyboardModelsModel* keyboardModels() const;
     KeyboardLayoutModel* keyboardLayouts() const;
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 55402fd14..03159268e 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -9,20 +9,19 @@
 
 #include "KeyboardViewStep.h"
 
+#include "Config.h"
 #include "KeyboardPage.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 
-#include "utils/Variant.h"
-
 CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardViewStepFactory, registerPlugin< KeyboardViewStep >(); )
 
 KeyboardViewStep::KeyboardViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
+    , m_config( new Config(this) )
     , m_widget( new KeyboardPage() )
     , m_nextEnabled( false )
-    , m_writeEtcDefaultKeyboard( true )
 {
     m_widget->init();
     m_nextEnabled = true;
@@ -91,7 +90,7 @@ KeyboardViewStep::isAtEnd() const
 QList< Calamares::job_ptr >
 KeyboardViewStep::jobs() const
 {
-    return m_jobs;
+    return m_config->createJobs();
 }
 
 
@@ -106,7 +105,6 @@ void
 KeyboardViewStep::onLeave()
 {
     m_widget->finalize();
-    m_jobs = m_widget->createJobs( m_xOrgConfFileName, m_convertedKeymapPath, m_writeEtcDefaultKeyboard );
     m_prettyStatus = m_widget->prettyStatus();
 }
 
@@ -114,37 +112,5 @@ KeyboardViewStep::onLeave()
 void
 KeyboardViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    using namespace CalamaresUtils;
-
-    if ( configurationMap.contains( "xOrgConfFileName" )
-         && configurationMap.value( "xOrgConfFileName" ).type() == QVariant::String
-         && !getString( configurationMap, "xOrgConfFileName" ).isEmpty() )
-    {
-        m_xOrgConfFileName = getString( configurationMap, "xOrgConfFileName" );
-    }
-    else
-    {
-        m_xOrgConfFileName = "00-keyboard.conf";
-    }
-
-    if ( configurationMap.contains( "convertedKeymapPath" )
-         && configurationMap.value( "convertedKeymapPath" ).type() == QVariant::String
-         && !getString( configurationMap, "convertedKeymapPath" ).isEmpty() )
-    {
-        m_convertedKeymapPath = getString( configurationMap, "convertedKeymapPath" );
-    }
-    else
-    {
-        m_convertedKeymapPath = QString();
-    }
-
-    if ( configurationMap.contains( "writeEtcDefaultKeyboard" )
-         && configurationMap.value( "writeEtcDefaultKeyboard" ).type() == QVariant::Bool )
-    {
-        m_writeEtcDefaultKeyboard = getBool( configurationMap, "writeEtcDefaultKeyboard", true );
-    }
-    else
-    {
-        m_writeEtcDefaultKeyboard = true;
-    }
+    m_config->setConfigurationMap(configurationMap);
 }
diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h
index aa9a1d335..5cf2c6fd9 100644
--- a/src/modules/keyboard/KeyboardViewStep.h
+++ b/src/modules/keyboard/KeyboardViewStep.h
@@ -17,6 +17,7 @@
 
 #include <QObject>
 
+class Config;
 class KeyboardPage;
 
 class PLUGINDLLEXPORT KeyboardViewStep : public Calamares::ViewStep
@@ -46,15 +47,10 @@ public:
     void setConfigurationMap( const QVariantMap& configurationMap ) override;
 
 private:
+    Config* m_config;
     KeyboardPage* m_widget;
     bool m_nextEnabled;
     QString m_prettyStatus;
-
-    QString m_xOrgConfFileName;
-    QString m_convertedKeymapPath;
-    bool m_writeEtcDefaultKeyboard;
-
-    Calamares::JobList m_jobs;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardViewStepFactory )
diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
index d42ab5269..08b72b3f4 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
@@ -79,7 +79,7 @@ void
 KeyboardQmlViewStep::onLeave()
 {
     m_config->finalize();
-    m_jobs = m_config->createJobs( m_xOrgConfFileName, m_convertedKeymapPath, m_writeEtcDefaultKeyboard );
+    // m_jobs = m_config->createJobs( m_xOrgConfFileName, m_convertedKeymapPath, m_writeEtcDefaultKeyboard );
     m_prettyStatus = m_config->prettyStatus();
 }
 

From bf50f8724db62b7b656523c34a1295b6d2a7847c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 18 Oct 2020 21:58:54 +0200
Subject: [PATCH 020/228] Changes: post-release housekeeping

---
 CHANGES        | 12 ++++++++++++
 CMakeLists.txt |  4 ++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 84b7d545d..911f7156e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,18 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.33 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - No external contributors yet
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - No module changes yet
+
+
 # 3.2.32.1 (2020-10-17) #
 
 This is a release to address source-incompatible changes in KPMcore 4.2.0,
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64acdece3..99f6cd42a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,10 +41,10 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.32.1
+    VERSION 3.2.33
     LANGUAGES C CXX )
 
-set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From 328a5bbbfb693c16e11e203ac98445e2a449c2d8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 17 Oct 2020 15:48:12 +0200
Subject: [PATCH 021/228] [users] Don't allow continuing with an empty login
 name

The status for an empty login name is '' (empty), for ok -- this is
so that there is no complaint about it. But it's not ok to
continue with an empty name.
---
 src/modules/users/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 024661d8d..1216b22a2 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -582,7 +582,7 @@ Config::isReady() const
 {
     bool readyFullName = !fullName().isEmpty();  // Needs some text
     bool readyHostname = hostNameStatus().isEmpty();  // .. no warning message
-    bool readyUsername = loginNameStatus().isEmpty();  // .. no warning message
+    bool readyUsername = !loginName().isEmpty() && loginNameStatus().isEmpty();  // .. no warning message
     bool readyUserPassword = userPasswordValidity() != Config::PasswordValidity::Invalid;
     bool readyRootPassword = rootPasswordValidity() != Config::PasswordValidity::Invalid;
     return readyFullName && readyHostname && readyUsername && readyUserPassword && readyRootPassword;

From 0cb6c89876f88e17a364df38264df9371c3c320a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 20 Oct 2020 23:15:32 +0200
Subject: [PATCH 022/228] [netinstall] Don't update selection state for items
 with no children

The special setup for nicely-named groups which have a single
hidden subgroup containing the actual packages, has the problem
that there is a non-empty subgroups item, but this results
in zero actual children: then the number of selected and partly
selected children is also zero in updateSelected() and therefore
the item ends up unselected.

Special-case this to avoid unnecessarily unselecting the item.
Reported by Vitor L.
---
 src/modules/netinstall/PackageModel.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/modules/netinstall/PackageModel.cpp b/src/modules/netinstall/PackageModel.cpp
index 147bd5a5c..d4887b6c2 100644
--- a/src/modules/netinstall/PackageModel.cpp
+++ b/src/modules/netinstall/PackageModel.cpp
@@ -267,8 +267,13 @@ PackageModel::setupModelData( const QVariantList& groupList, PackageTreeItem* pa
                 setupModelData( subgroups, item );
                 // The children might be checked while the parent isn't (yet).
                 // Children are added to their parent (below) without affecting
-                // the checked-state -- do it manually.
-                item->updateSelected();
+                // the checked-state -- do it manually. Items with subgroups
+                // but no children have only hidden children -- those get
+                // handled specially.
+                if ( item->childCount() > 0 )
+                {
+                    item->updateSelected();
+                }
             }
             else
             {

From 29e6934672464fa84bca5faa7440919184c8da00 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 21 Oct 2020 14:43:45 +0200
Subject: [PATCH 023/228] [users] Factor out Sudo creation into separate job

---
 src/modules/users/CMakeLists.txt    |  1 +
 src/modules/users/Config.cpp        |  9 ++++-
 src/modules/users/CreateUserJob.cpp | 25 -------------
 src/modules/users/MiscJobs.cpp      | 57 +++++++++++++++++++++++++++++
 src/modules/users/MiscJobs.h        | 34 +++++++++++++++++
 5 files changed, 100 insertions(+), 26 deletions(-)
 create mode 100644 src/modules/users/MiscJobs.cpp
 create mode 100644 src/modules/users/MiscJobs.h

diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index 5752ae67a..d758e2bb9 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -25,6 +25,7 @@ include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
 
 set( JOB_SRC
     CreateUserJob.cpp
+    MiscJobs.cpp
     SetPasswordJob.cpp
     SetHostNameJob.cpp
 )
diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 1216b22a2..dc50f42c5 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -10,6 +10,7 @@
 #include "Config.h"
 
 #include "CreateUserJob.h"
+#include "MiscJobs.h"
 #include "SetHostNameJob.h"
 #include "SetPasswordJob.h"
 
@@ -103,7 +104,7 @@ Config::setUserShell( const QString& shell )
     if ( shell != m_userShell )
     {
         m_userShell = shell;
-        emit userShellChanged(shell);
+        emit userShellChanged( shell );
         // The shell is put into GS as well.
         auto* gs = Calamares::JobQueue::instance()->globalStorage();
         if ( gs )
@@ -796,6 +797,12 @@ Config::createJobs() const
 
     Calamares::Job* j;
 
+    if ( m_sudoersGroup.isEmpty() )
+    {
+        j = new SetupSudoJob( m_sudoersGroup );
+        jobs.append( Calamares::job_ptr( j ) );
+    }
+
     j = new CreateUserJob( this );
     jobs.append( Calamares::job_ptr( j ) );
 
diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
index c9830abd4..efbc4d9e3 100644
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@@ -166,31 +166,6 @@ CreateUserJob::exec()
         reuseHome = gs->value( "reuseHome" ).toBool();
     }
 
-    if ( !m_config->sudoersGroup().isEmpty() )
-    {
-        m_status = tr( "Preparing sudo for user %1" ).arg( m_config->loginName() );
-        emit progress( 0.05 );
-        cDebug() << "[CREATEUSER]: preparing sudoers";
-
-        QString sudoersLine = QString( "%%1 ALL=(ALL) ALL\n" ).arg( m_config->sudoersGroup() );
-        auto fileResult
-            = CalamaresUtils::System::instance()->createTargetFile( QStringLiteral( "/etc/sudoers.d/10-installer" ),
-                                                                    sudoersLine.toUtf8().constData(),
-                                                                    CalamaresUtils::System::WriteMode::Overwrite );
-
-        if ( fileResult )
-        {
-            if ( !CalamaresUtils::Permissions::apply( fileResult.path(), 0440 ) )
-            {
-                return Calamares::JobResult::error( tr( "Cannot chmod sudoers file." ) );
-            }
-        }
-        else
-        {
-            return Calamares::JobResult::error( tr( "Cannot create sudoers file for writing." ) );
-        }
-    }
-
     cDebug() << "[CREATEUSER]: preparing groups";
 
     m_status = tr( "Preparing groups for user %1" ).arg( m_config->loginName() );
diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp
new file mode 100644
index 000000000..4f9472cc6
--- /dev/null
+++ b/src/modules/users/MiscJobs.cpp
@@ -0,0 +1,57 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#include "MiscJobs.h"
+
+#include "Config.h"
+
+#include "utils/CalamaresUtilsSystem.h"
+#include "utils/Logger.h"
+#include "utils/Permissions.h"
+
+SetupSudoJob::SetupSudoJob( const QString& group )
+    : m_sudoGroup( group )
+{
+}
+
+QString
+SetupSudoJob::prettyName() const
+{
+    return tr( "Configure <pre>sudo</pre> users." );
+}
+
+Calamares::JobResult
+SetupSudoJob::exec()
+{
+    if ( m_sudoGroup.isEmpty() )
+    {
+        return Calamares::JobResult::ok();
+    }
+
+    QString sudoersLine = QString( "%%1 ALL=(ALL) ALL\n" ).arg( m_sudoGroup );
+    auto fileResult
+        = CalamaresUtils::System::instance()->createTargetFile( QStringLiteral( "/etc/sudoers.d/10-installer" ),
+                                                                sudoersLine.toUtf8().constData(),
+                                                                CalamaresUtils::System::WriteMode::Overwrite );
+
+    if ( fileResult )
+    {
+        if ( !CalamaresUtils::Permissions::apply( fileResult.path(), 0440 ) )
+        {
+            return Calamares::JobResult::error( tr( "Cannot chmod sudoers file." ) );
+        }
+    }
+    else
+    {
+        return Calamares::JobResult::error( tr( "Cannot create sudoers file for writing." ) );
+    }
+
+    return Calamares::JobResult::ok();
+}
diff --git a/src/modules/users/MiscJobs.h b/src/modules/users/MiscJobs.h
new file mode 100644
index 000000000..2f8055e8a
--- /dev/null
+++ b/src/modules/users/MiscJobs.h
@@ -0,0 +1,34 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
+ *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+/**@file Various small jobs
+ *
+ * This file collects miscellaneous jobs that need to be run to prepare
+ * the system for the user-creation job.
+ */
+
+#ifndef USERS_MISCJOBS_H
+#define USERS_MISCJOBS_H
+
+#include "Job.h"
+
+class SetupSudoJob : public Calamares::Job
+{
+    Q_OBJECT
+public:
+    SetupSudoJob( const QString& group );
+    QString prettyName() const override;
+    Calamares::JobResult exec() override;
+
+public:
+    QString m_sudoGroup;
+};
+
+#endif

From 6560ef00a1bbb38f1a5262e6d67289574b906881 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 21 Oct 2020 14:46:07 +0200
Subject: [PATCH 024/228] [usersq] Fix build of usersq after refactor elsewhere

---
 src/modules/usersq/CMakeLists.txt | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt
index 26c270bfb..b6717e7b8 100644
--- a/src/modules/usersq/CMakeLists.txt
+++ b/src/modules/usersq/CMakeLists.txt
@@ -33,12 +33,13 @@ calamares_add_plugin( usersq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
-		${_users}/Config.cpp
-		${_users}/CreateUserJob.cpp
+        ${_users}/CheckPWQuality.cpp
+        ${_users}/Config.cpp
+        ${_users}/CreateUserJob.cpp
+        ${_users}/MiscJobs.cpp
+        ${_users}/SetHostNameJob.cpp
         ${_users}/SetPasswordJob.cpp
         UsersQmlViewStep.cpp
-        ${_users}/SetHostNameJob.cpp
-        ${_users}/CheckPWQuality.cpp
     RESOURCES
         usersq.qrc
     LINK_PRIVATE_LIBRARIES

From 3d289f345ad4d175842c2eb1448b9c869ca9c20e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 21 Oct 2020 15:02:33 +0200
Subject: [PATCH 025/228] [users] Refactor users functionality to a static lib

- this makes it less fragile to share all the functionality
  with usersq, since it ends up in the library which is shared
  between the modules.
---
 src/modules/users/CMakeLists.txt  | 27 ++++++++++++++++++---------
 src/modules/users/Config.h        |  2 +-
 src/modules/usersq/CMakeLists.txt | 10 ++--------
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index d758e2bb9..ca5d24d34 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -23,25 +23,35 @@ endif()
 
 include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
 
-set( JOB_SRC
+set( _users_src
+    # Jobs
     CreateUserJob.cpp
     MiscJobs.cpp
     SetPasswordJob.cpp
     SetHostNameJob.cpp
-)
-set( CONFIG_SRC
+    # Configuration
     CheckPWQuality.cpp
     Config.cpp
 )
 
+calamares_add_library(
+    users_internal
+    EXPORT_MACRO PLUGINDLLEXPORT_PRO
+    TARGET_TYPE STATIC
+    NO_INSTALL
+    NO_VERSION
+    SOURCES
+        ${_users_src}
+    LINK_LIBRARIES
+        Qt5::DBus
+)
+
 calamares_add_plugin( users
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
         UsersViewStep.cpp
         UsersPage.cpp
-        ${JOB_SRC}
-        ${CONFIG_SRC}
     UI
         page_usersetup.ui
     RESOURCES
@@ -50,7 +60,7 @@ calamares_add_plugin( users
         calamaresui
         ${CRYPT_LIBRARIES}
         ${USER_EXTRA_LIB}
-        Qt5::DBus
+        users_internal
     SHARED_LIB
 )
 
@@ -83,10 +93,9 @@ calamares_add_test(
     userstest
     SOURCES
         Tests.cpp
-        ${JOB_SRC}
-        ${CONFIG_SRC}
+        ${_users_src}  # Build again with test-visibility
     LIBRARIES
         ${USER_EXTRA_LIB}
-        Qt5::DBus  # HostName job can use DBus to systemd
         ${CRYPT_LIBRARIES}  # SetPassword job uses crypt()
+        Qt5::DBus  # HostName job can use DBus to systemd
 )
diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h
index 04f37d231..57da73e30 100644
--- a/src/modules/users/Config.h
+++ b/src/modules/users/Config.h
@@ -84,7 +84,7 @@ private:
 };
 
 
-class Config : public QObject
+class PLUGINDLLEXPORT Config : public QObject
 {
     Q_OBJECT
 
diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt
index b6717e7b8..951359c77 100644
--- a/src/modules/usersq/CMakeLists.txt
+++ b/src/modules/usersq/CMakeLists.txt
@@ -13,9 +13,8 @@ find_package( Crypt REQUIRED )
 
 # Add optional libraries here
 set( USER_EXTRA_LIB )
-set( _users ${CMAKE_CURRENT_SOURCE_DIR}/../users )
 
-include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui ${CMAKE_CURRENT_SOURCE_DIR}/../../libcalamares ${_users} )
+include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../users )
 
 find_package( LibPWQuality )
 set_package_properties(
@@ -33,12 +32,6 @@ calamares_add_plugin( usersq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO
     SOURCES
-        ${_users}/CheckPWQuality.cpp
-        ${_users}/Config.cpp
-        ${_users}/CreateUserJob.cpp
-        ${_users}/MiscJobs.cpp
-        ${_users}/SetHostNameJob.cpp
-        ${_users}/SetPasswordJob.cpp
         UsersQmlViewStep.cpp
     RESOURCES
         usersq.qrc
@@ -47,5 +40,6 @@ calamares_add_plugin( usersq
         ${CRYPT_LIBRARIES}
         ${USER_EXTRA_LIB}
         Qt5::DBus
+        users_internal
     SHARED_LIB
 )

From fa1d314b13fb1f605bf7d29755067bfcc12919eb Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 22 Oct 2020 13:49:45 +0200
Subject: [PATCH 026/228] [users] Refactor group-creation into separate Job

---
 src/modules/users/MiscJobs.cpp | 126 +++++++++++++++++++++++++++++++++
 src/modules/users/MiscJobs.h   |  16 +++++
 2 files changed, 142 insertions(+)

diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp
index 4f9472cc6..04880d1d8 100644
--- a/src/modules/users/MiscJobs.cpp
+++ b/src/modules/users/MiscJobs.cpp
@@ -12,10 +12,16 @@
 
 #include "Config.h"
 
+#include "GlobalStorage.h"
+#include "JobQueue.h"
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
 #include "utils/Permissions.h"
 
+#include <QDir>
+#include <QFile>
+#include <QFileInfo>
+
 SetupSudoJob::SetupSudoJob( const QString& group )
     : m_sudoGroup( group )
 {
@@ -55,3 +61,123 @@ SetupSudoJob::exec()
 
     return Calamares::JobResult::ok();
 }
+
+STATICTEST QStringList
+groupsInTargetSystem()
+{
+    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
+    QDir targetRoot( gs->value( "rootMountPoint" ).toString() );
+
+    QFileInfo groupsFi( targetRoot.absoluteFilePath( "etc/group" ) );
+    QFile groupsFile( groupsFi.absoluteFilePath() );
+    if ( !groupsFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
+    {
+        return QStringList();
+    }
+    QString groupsData = QString::fromLocal8Bit( groupsFile.readAll() );
+    QStringList groupsLines = groupsData.split( '\n' );
+    QStringList::iterator it = groupsLines.begin();
+    while ( it != groupsLines.end() )
+    {
+        if ( it->startsWith( '#' ) )
+        {
+            it = groupsLines.erase( it );
+            continue;
+        }
+        int indexOfFirstToDrop = it->indexOf( ':' );
+        if ( indexOfFirstToDrop < 1 )
+        {
+            it = groupsLines.erase( it );
+            continue;
+        }
+        it->truncate( indexOfFirstToDrop );
+        ++it;
+    }
+    return groupsLines;
+}
+
+/** @brief Create groups in target system as needed
+ *
+ * Given a list of groups that already exist, @p availableGroups,
+ * go through the @p wantedGroups and create each of them. Groups that
+ * fail, or which should have already been there, are added to
+ * @p missingGroups by name.
+ */
+static bool
+ensureGroupsExistInTarget( const QList< GroupDescription >& wantedGroups,
+                           const QStringList& availableGroups,
+                           QStringList& missingGroups )
+{
+    int failureCount = 0;
+
+    for ( const auto& group : wantedGroups )
+    {
+        int groupaddResult = 0;
+        if ( group.isValid() && !availableGroups.contains( group.name() ) )
+        {
+            if ( group.mustAlreadyExist() )
+            {
+                // Should have been there already: don't create it
+                missingGroups.append( group.name() );
+                continue;
+            }
+
+#ifdef __FreeBSD__
+            groupaddResult
+                = CalamaresUtils::System::instance()->targetEnvCall( { "pw", "groupadd", "-n", group.name() } );
+#else
+            groupaddResult = CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", group.name() } );
+#endif
+            if ( groupaddResult )
+            {
+                failureCount++;
+                missingGroups.append( group.name() + QChar( '*' ) );
+            }
+        }
+    }
+    if ( !missingGroups.isEmpty() )
+    {
+        cWarning() << "Missing groups in target system (* for groupadd failure):" << Logger::DebugList( missingGroups );
+    }
+    return failureCount == 0;
+}
+
+SetupGroupsJob::SetupGroupsJob( const Config* config, const QString& autologinGroup )
+    : m_autologinGroup( autologinGroup )
+    , m_config( config )
+{
+}
+
+QString
+SetupGroupsJob::prettyName() const
+{
+    return tr( "Preparing groups." );
+}
+
+Calamares::JobResult
+SetupGroupsJob::exec()
+{
+    const auto& defaultGroups = m_config->defaultGroups();
+    QStringList availableGroups = groupsInTargetSystem();
+    QStringList missingGroups;
+
+    if ( !ensureGroupsExistInTarget( defaultGroups, availableGroups, missingGroups ) )
+    {
+        return Calamares::JobResult::error( tr( "Could not create groups in target system" ) );
+    }
+    if ( !missingGroups.isEmpty() )
+    {
+        return Calamares::JobResult::error(
+            tr( "Could not create groups in target system" ),
+            tr( "These groups are missing in the target system: %1" ).arg( missingGroups.join( ',' ) ) );
+    }
+
+    if ( m_config->doAutoLogin() && !m_config->autologinGroup().isEmpty() )
+    {
+        const QString autologinGroup = m_config->autologinGroup();
+        (void)ensureGroupsExistInTarget(
+            QList< GroupDescription >() << GroupDescription( autologinGroup ), availableGroups, missingGroups );
+    }
+
+    return Calamares::JobResult::ok();
+}
diff --git a/src/modules/users/MiscJobs.h b/src/modules/users/MiscJobs.h
index 2f8055e8a..8065079ce 100644
--- a/src/modules/users/MiscJobs.h
+++ b/src/modules/users/MiscJobs.h
@@ -19,6 +19,8 @@
 
 #include "Job.h"
 
+class Config;
+
 class SetupSudoJob : public Calamares::Job
 {
     Q_OBJECT
@@ -31,4 +33,18 @@ public:
     QString m_sudoGroup;
 };
 
+class SetupGroupsJob : public Calamares::Job
+{
+    Q_OBJECT
+
+public:
+    SetupGroupsJob( const Config* config, const QString& autologinGroup );
+    QString prettyName() const override;
+    Calamares::JobResult exec() override;
+
+public:
+    QString m_autologinGroup;
+    const Config* m_config;
+};
+
 #endif

From 03541470d53c63504ea6609217c1f98ba6078b18 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 22 Oct 2020 14:07:40 +0200
Subject: [PATCH 027/228] [users] Handle system-group creating specially

---
 src/modules/users/Config.cpp   | 18 ++++++++++++++++++
 src/modules/users/Config.h     |  6 ++++++
 src/modules/users/MiscJobs.cpp | 18 +++++++++++++-----
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index dc50f42c5..fff6e3960 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -136,6 +136,24 @@ Config::setAutologinGroup( const QString& group )
     }
 }
 
+QStringList
+Config::groupsForThisUser() const
+{
+    QStringList l;
+    l.reserve( defaultGroups().size() + 1 );
+
+    for ( const auto& g : defaultGroups() )
+    {
+        l << g.name();
+    }
+    if ( doAutoLogin() && !autologinGroup().isEmpty() )
+    {
+        l << autologinGroup();
+    }
+
+    return l;
+}
+
 void
 Config::setSudoersGroup( const QString& group )
 {
diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h
index 57da73e30..d4bfee4a4 100644
--- a/src/modules/users/Config.h
+++ b/src/modules/users/Config.h
@@ -68,6 +68,7 @@ public:
 
     bool isValid() const { return m_isValid; }
     bool isSystemGroup() const { return m_isSystem; }
+    bool mustAlreadyExist() const { return m_mustAlreadyExist; }
     QString name() const { return m_name; }
 
     ///@brief Equality of groups depends only on name and kind
@@ -213,6 +214,11 @@ public:
     bool requireStrongPasswords() const { return m_requireStrongPasswords; }
 
     const QList< GroupDescription >& defaultGroups() const { return m_defaultGroups; }
+    /** @brief the names of all the groups for the current user
+     *
+     * Takes into account defaultGroups and autologin behavior.
+     */
+    QStringList groupsForThisUser() const;
 
     // The user enters a password (and again in a separate UI element)
     QString userPassword() const { return m_userPassword; }
diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp
index 04880d1d8..b6fbe55db 100644
--- a/src/modules/users/MiscJobs.cpp
+++ b/src/modules/users/MiscJobs.cpp
@@ -112,7 +112,6 @@ ensureGroupsExistInTarget( const QList< GroupDescription >& wantedGroups,
 
     for ( const auto& group : wantedGroups )
     {
-        int groupaddResult = 0;
         if ( group.isValid() && !availableGroups.contains( group.name() ) )
         {
             if ( group.mustAlreadyExist() )
@@ -122,13 +121,22 @@ ensureGroupsExistInTarget( const QList< GroupDescription >& wantedGroups,
                 continue;
             }
 
+            QStringList cmd;
 #ifdef __FreeBSD__
-            groupaddResult
-                = CalamaresUtils::System::instance()->targetEnvCall( { "pw", "groupadd", "-n", group.name() } );
+            if ( group.isSystemGroup() )
+            {
+                cWarning() << "Ignoring must-be-a-system group for" << group.name() << "on FreeBSD";
+            }
+            cmd = QStringList { "pw", "groupadd", "-n", group.name() };
 #else
-            groupaddResult = CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", group.name() } );
+            cmd << QStringLiteral( "groupadd" );
+            if ( group.isSystemGroup() )
+            {
+                cmd << "--system";
+            }
+            cmd << group.name();
 #endif
-            if ( groupaddResult )
+            if ( CalamaresUtils::System::instance()->targetEnvCall( cmd ) )
             {
                 failureCount++;
                 missingGroups.append( group.name() + QChar( '*' ) );

From f1772a7eae565ab8dc474c8b0d58fa889d80b152 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 22 Oct 2020 14:11:01 +0200
Subject: [PATCH 028/228] [users] Create groups in a separate job

---
 src/modules/users/Config.cpp        |  3 ++
 src/modules/users/CreateUserJob.cpp | 71 +----------------------------
 src/modules/users/MiscJobs.cpp      |  5 +-
 src/modules/users/MiscJobs.h        |  3 +-
 4 files changed, 7 insertions(+), 75 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index fff6e3960..0e70cc215 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -821,6 +821,9 @@ Config::createJobs() const
         jobs.append( Calamares::job_ptr( j ) );
     }
 
+    j = new SetupGroupsJob( this );
+    jobs.append( Calamares::job_ptr( j ) );
+
     j = new CreateUserJob( this );
     jobs.append( Calamares::job_ptr( j ) );
 
diff --git a/src/modules/users/CreateUserJob.cpp b/src/modules/users/CreateUserJob.cpp
index efbc4d9e3..e08108a46 100644
--- a/src/modules/users/CreateUserJob.cpp
+++ b/src/modules/users/CreateUserJob.cpp
@@ -50,53 +50,6 @@ CreateUserJob::prettyStatusMessage() const
     return m_status.isEmpty() ? tr( "Creating user %1." ).arg( m_config->loginName() ) : m_status;
 }
 
-STATICTEST QStringList
-groupsInTargetSystem( const QDir& targetRoot )
-{
-    QFileInfo groupsFi( targetRoot.absoluteFilePath( "etc/group" ) );
-    QFile groupsFile( groupsFi.absoluteFilePath() );
-    if ( !groupsFile.open( QIODevice::ReadOnly | QIODevice::Text ) )
-    {
-        return QStringList();
-    }
-    QString groupsData = QString::fromLocal8Bit( groupsFile.readAll() );
-    QStringList groupsLines = groupsData.split( '\n' );
-    QStringList::iterator it = groupsLines.begin();
-    while ( it != groupsLines.end() )
-    {
-        if ( it->startsWith( '#' ) )
-        {
-            it = groupsLines.erase( it );
-            continue;
-        }
-        int indexOfFirstToDrop = it->indexOf( ':' );
-        if ( indexOfFirstToDrop < 1 )
-        {
-            it = groupsLines.erase( it );
-            continue;
-        }
-        it->truncate( indexOfFirstToDrop );
-        ++it;
-    }
-    return groupsLines;
-}
-
-static void
-ensureGroupsExistInTarget( const QList< GroupDescription >& wantedGroups, const QStringList& availableGroups )
-{
-    for ( const auto& group : wantedGroups )
-    {
-        if ( group.isValid() && !availableGroups.contains( group.name() ) )
-        {
-#ifdef __FreeBSD__
-            CalamaresUtils::System::instance()->targetEnvCall( { "pw", "groupadd", "-n", group.name() } );
-#else
-            CalamaresUtils::System::instance()->targetEnvCall( { "groupadd", group.name() } );
-#endif
-        }
-    }
-}
-
 static Calamares::JobResult
 createUser( const QString& loginName, const QString& fullName, const QString& shell )
 {
@@ -166,28 +119,6 @@ CreateUserJob::exec()
         reuseHome = gs->value( "reuseHome" ).toBool();
     }
 
-    cDebug() << "[CREATEUSER]: preparing groups";
-
-    m_status = tr( "Preparing groups for user %1" ).arg( m_config->loginName() );
-    emit progress( 0.1 );
-    // loginName(), fullName().isEmpty() ? loginName() : fullName(), doAutoLogin(), groupNames );
-    const auto& defaultGroups = m_config->defaultGroups();
-    QStringList groupsForThisUser = std::accumulate(
-        defaultGroups.begin(),
-        defaultGroups.end(),
-        QStringList(),
-        []( const QStringList& l, const GroupDescription& g ) { return QStringList( l ) << g.name(); } );
-
-    QStringList availableGroups = groupsInTargetSystem( destDir );
-    ensureGroupsExistInTarget( defaultGroups, availableGroups );
-
-    if ( m_config->doAutoLogin() && !m_config->autologinGroup().isEmpty() )
-    {
-        const QString autologinGroup = m_config->autologinGroup();
-        groupsForThisUser << autologinGroup;
-        ensureGroupsExistInTarget( QList< GroupDescription >() << GroupDescription( autologinGroup ), availableGroups );
-    }
-
     // If we're looking to reuse the contents of an existing /home.
     // This GS setting comes from the **partitioning** module.
     if ( reuseHome )
@@ -219,7 +150,7 @@ CreateUserJob::exec()
 
     m_status = tr( "Configuring user %1" ).arg( m_config->loginName() );
     emit progress( 0.8 );
-    auto usergroupsResult = setUserGroups( m_config->loginName(), groupsForThisUser );
+    auto usergroupsResult = setUserGroups( m_config->loginName(), m_config->groupsForThisUser() );
     if ( !usergroupsResult )
     {
         return usergroupsResult;
diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp
index b6fbe55db..4f2570a0a 100644
--- a/src/modules/users/MiscJobs.cpp
+++ b/src/modules/users/MiscJobs.cpp
@@ -150,9 +150,8 @@ ensureGroupsExistInTarget( const QList< GroupDescription >& wantedGroups,
     return failureCount == 0;
 }
 
-SetupGroupsJob::SetupGroupsJob( const Config* config, const QString& autologinGroup )
-    : m_autologinGroup( autologinGroup )
-    , m_config( config )
+SetupGroupsJob::SetupGroupsJob( const Config* config )
+    : m_config( config )
 {
 }
 
diff --git a/src/modules/users/MiscJobs.h b/src/modules/users/MiscJobs.h
index 8065079ce..fe4ff87c0 100644
--- a/src/modules/users/MiscJobs.h
+++ b/src/modules/users/MiscJobs.h
@@ -38,12 +38,11 @@ class SetupGroupsJob : public Calamares::Job
     Q_OBJECT
 
 public:
-    SetupGroupsJob( const Config* config, const QString& autologinGroup );
+    SetupGroupsJob( const Config* config );
     QString prettyName() const override;
     Calamares::JobResult exec() override;
 
 public:
-    QString m_autologinGroup;
     const Config* m_config;
 };
 

From 5b4f9d0b98ff6e0e71dad47b9afc00921c8d6e80 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 22 Oct 2020 14:21:14 +0200
Subject: [PATCH 029/228] [users] Adjust tests for changed API

---
 src/modules/users/CMakeLists.txt        |  6 +++---
 src/modules/users/TestCreateUserJob.cpp | 21 +++++++++------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index ca5d24d34..8680de73b 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -74,10 +74,10 @@ calamares_add_test(
 )
 
 calamares_add_test(
-    userscreatetest
+    usersgroupstest
     SOURCES
-        TestCreateUserJob.cpp
-        CreateUserJob.cpp
+        TestCreateUserJob.cpp  # Misnomer
+        MiscJobs.cpp
 )
 
 calamares_add_test(
diff --git a/src/modules/users/TestCreateUserJob.cpp b/src/modules/users/TestCreateUserJob.cpp
index fc2d74dcd..11bdfaa01 100644
--- a/src/modules/users/TestCreateUserJob.cpp
+++ b/src/modules/users/TestCreateUserJob.cpp
@@ -15,14 +15,14 @@
 #include <QtTest/QtTest>
 
 // Implementation details
-extern QStringList groupsInTargetSystem( const QDir& targetRoot );  // CreateUserJob
+extern QStringList groupsInTargetSystem();  // CreateUserJob
 
-class CreateUserTests : public QObject
+class GroupTests : public QObject
 {
     Q_OBJECT
 public:
-    CreateUserTests();
-    ~CreateUserTests() override {}
+    GroupTests();
+    ~GroupTests() override {}
 
 private Q_SLOTS:
     void initTestCase();
@@ -30,23 +30,20 @@ private Q_SLOTS:
     void testReadGroup();
 };
 
-CreateUserTests::CreateUserTests() {}
+GroupTests::GroupTests() {}
 
 void
-CreateUserTests::initTestCase()
+GroupTests::initTestCase()
 {
     Logger::setupLogLevel( Logger::LOGDEBUG );
     cDebug() << "Users test started.";
 }
 
 void
-CreateUserTests::testReadGroup()
+GroupTests::testReadGroup()
 {
-    QDir root( "/" );
-    QVERIFY( root.exists() );
-
     // Get the groups in the host system
-    QStringList groups = groupsInTargetSystem( root );
+    QStringList groups = groupsInTargetSystem();
     QVERIFY( groups.count() > 2 );
 #ifdef __FreeBSD__
     QVERIFY( groups.contains( QStringLiteral( "wheel" ) ) );
@@ -65,7 +62,7 @@ CreateUserTests::testReadGroup()
     }
 }
 
-QTEST_GUILESS_MAIN( CreateUserTests )
+QTEST_GUILESS_MAIN( GroupTests )
 
 #include "utils/moc-warnings.h"
 

From 89d495d5fb914fe6e3810fd9f3a053c207aa0782 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 22 Oct 2020 14:22:11 +0200
Subject: [PATCH 030/228] [users] Rename file to match its purpose

---
 src/modules/users/CMakeLists.txt                                | 2 +-
 .../users/{TestCreateUserJob.cpp => TestGroupInformation.cpp}   | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/modules/users/{TestCreateUserJob.cpp => TestGroupInformation.cpp} (100%)

diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index 8680de73b..34a0f6856 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -76,7 +76,7 @@ calamares_add_test(
 calamares_add_test(
     usersgroupstest
     SOURCES
-        TestCreateUserJob.cpp  # Misnomer
+        TestGroupInformation.cpp
         MiscJobs.cpp
 )
 
diff --git a/src/modules/users/TestCreateUserJob.cpp b/src/modules/users/TestGroupInformation.cpp
similarity index 100%
rename from src/modules/users/TestCreateUserJob.cpp
rename to src/modules/users/TestGroupInformation.cpp

From d91683eec63e629a0588a8fd25a0246fe27b87d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Thu, 22 Oct 2020 13:19:28 -0400
Subject: [PATCH 031/228] [partition] Fix message user if no option available

The button m_eraseButton is not tested while the button
m_somethingElseButton is tested twice.
---
 src/modules/partition/gui/ChoicePage.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index ac8d6fd92..897f89165 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -1464,7 +1464,7 @@ ChoicePage::setupActions()
     }
 
     if ( m_somethingElseButton->isHidden() && m_alongsideButton->isHidden() && m_replaceButton->isHidden()
-         && m_somethingElseButton->isHidden() )
+         && m_eraseButton->isHidden() )
     {
         if ( atLeastOneIsMounted )
         {

From cd8c3089cbfa1f2b4d3a1ef85189f0fc162596a1 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 11:14:59 +0200
Subject: [PATCH 032/228] [users] Fix build: renamed moc file

---
 src/modules/users/TestGroupInformation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp
index 11bdfaa01..3a04409d5 100644
--- a/src/modules/users/TestGroupInformation.cpp
+++ b/src/modules/users/TestGroupInformation.cpp
@@ -66,4 +66,4 @@ QTEST_GUILESS_MAIN( GroupTests )
 
 #include "utils/moc-warnings.h"
 
-#include "TestCreateUserJob.moc"
+#include "TestGroupInformation.moc"

From c412e285c29e9f055eba42b7153deac73526aa03 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 12:01:29 +0200
Subject: [PATCH 033/228] [libcalamares] Link publicly to yaml-cpp

Needed on FreeBSD, where you otherwise might not get the
include paths for yaml-cpp added -- and utils/Yaml.h
expects them to be there.
---
 src/libcalamares/CMakeLists.txt  | 2 +-
 src/modules/users/CMakeLists.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index b1e40c3ae..a8b96065f 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -148,8 +148,8 @@ calamares_automoc( calamares )
 target_link_libraries( calamares
     LINK_PRIVATE
         ${OPTIONAL_PRIVATE_LIBRARIES}
-        yamlcpp
     LINK_PUBLIC
+        yamlcpp
         Qt5::Core
         KF5::CoreAddons
         ${OPTIONAL_PUBLIC_LIBRARIES}
diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index 5752ae67a..fdae38440 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -85,7 +85,7 @@ calamares_add_test(
         ${JOB_SRC}
         ${CONFIG_SRC}
     LIBRARIES
-        ${USER_EXTRA_LIB}
         Qt5::DBus  # HostName job can use DBus to systemd
         ${CRYPT_LIBRARIES}  # SetPassword job uses crypt()
+        ${USER_EXTRA_LIB}
 )

From 63196ab58fc09b71163ec5ecd0e0f5c82dd3d180 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 12:19:28 +0200
Subject: [PATCH 034/228] [users] Avoid crashes in tests due to nullptr GS

---
 src/modules/users/MiscJobs.cpp             | 4 ++++
 src/modules/users/TestGroupInformation.cpp | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp
index 4f2570a0a..a62ada6d7 100644
--- a/src/modules/users/MiscJobs.cpp
+++ b/src/modules/users/MiscJobs.cpp
@@ -66,6 +66,10 @@ STATICTEST QStringList
 groupsInTargetSystem()
 {
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
+    if ( !gs )
+    {
+        return QStringList();
+    }
     QDir targetRoot( gs->value( "rootMountPoint" ).toString() );
 
     QFileInfo groupsFi( targetRoot.absoluteFilePath( "etc/group" ) );
diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp
index 3a04409d5..6f650049a 100644
--- a/src/modules/users/TestGroupInformation.cpp
+++ b/src/modules/users/TestGroupInformation.cpp
@@ -9,6 +9,7 @@
 
 #include "CreateUserJob.h"
 
+#include "JobQueue.h"
 #include "utils/Logger.h"
 
 #include <QDir>
@@ -37,6 +38,10 @@ GroupTests::initTestCase()
 {
     Logger::setupLogLevel( Logger::LOGDEBUG );
     cDebug() << "Users test started.";
+    if ( !Calamares::JobQueue::instance() )
+    {
+        (void)new Calamares::JobQueue();
+    }
 }
 
 void

From 0d4d3e3c4d14ad86bd2c27a9dcb3f720660c7ab2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 12:27:44 +0200
Subject: [PATCH 035/228] [users] Set up GS rootMountPoint for test

---
 src/modules/users/TestGroupInformation.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp
index 6f650049a..3b2046bda 100644
--- a/src/modules/users/TestGroupInformation.cpp
+++ b/src/modules/users/TestGroupInformation.cpp
@@ -9,6 +9,7 @@
 
 #include "CreateUserJob.h"
 
+#include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "utils/Logger.h"
 
@@ -47,6 +48,7 @@ GroupTests::initTestCase()
 void
 GroupTests::testReadGroup()
 {
+    Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/" );
     // Get the groups in the host system
     QStringList groups = groupsInTargetSystem();
     QVERIFY( groups.count() > 2 );

From 9e624c7bd5aa81aaabb219566f276919396a490f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 12:40:03 +0200
Subject: [PATCH 036/228] [unpackfs] Fix schema validation

- the *weight* key was introduced without a corresponding schema
  change, so the examples didn't validate anymore.
---
 src/modules/unpackfs/unpackfs.schema.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/unpackfs/unpackfs.schema.yaml b/src/modules/unpackfs/unpackfs.schema.yaml
index 66c7c0da8..0d96fe9cb 100644
--- a/src/modules/unpackfs/unpackfs.schema.yaml
+++ b/src/modules/unpackfs/unpackfs.schema.yaml
@@ -17,4 +17,5 @@ properties:
                 destination: { type: string }
                 excludeFile: { type: string }
                 exclude: { type: array, items: { type: string } }
+                weight: { type: integer, exclusiveMinimum: 0 }
             required: [ source , sourcefs, destination ]

From daeee09fdbc796fd76ff2ae7a1ee683ddd2ad88c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 17:15:55 +0200
Subject: [PATCH 037/228] [machineid] Simplify loading of the list of
 entropy-files

---
 src/modules/machineid/MachineIdJob.cpp | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/modules/machineid/MachineIdJob.cpp b/src/modules/machineid/MachineIdJob.cpp
index 8a33288b9..fef63828a 100644
--- a/src/modules/machineid/MachineIdJob.cpp
+++ b/src/modules/machineid/MachineIdJob.cpp
@@ -153,18 +153,13 @@ MachineIdJob::setConfigurationMap( const QVariantMap& map )
     m_dbus_symlink = m_dbus && m_dbus_symlink;
 
     m_entropy_copy = CalamaresUtils::getBool( map, "entropy-copy", false );
-
     m_entropy_files = CalamaresUtils::getStringList( map, "entropy-files" );
     if ( CalamaresUtils::getBool( map, "entropy", false ) )
     {
-        cWarning() << "MachineId:: configuration setting *entropy* is deprecated, use *entropy-files*.";
-
-        QString target_entropy_file = QStringLiteral( "/var/lib/urandom/random-seed" );
-        if ( !m_entropy_files.contains( target_entropy_file ) )
-        {
-            m_entropy_files.append( target_entropy_file );
-        }
+        cWarning() << "MachineId:: configuration setting *entropy* is deprecated, use *entropy-files* instead.";
+        m_entropy_files.append( QStringLiteral( "/var/lib/urandom/random-seed" ) );
     }
+    m_entropy_files.removeDuplicates();
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( MachineIdJobFactory, registerPlugin< MachineIdJob >(); )

From aa6109d4700ba3d4c8306762fb84a4f15d1055aa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 17:16:24 +0200
Subject: [PATCH 038/228] [machineid] Improve config-documentation

---
 src/modules/machineid/machineid.conf        | 30 ++++++++++++++++-----
 src/modules/machineid/machineid.schema.yaml |  8 +++---
 2 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/src/modules/machineid/machineid.conf b/src/modules/machineid/machineid.conf
index c6189e598..15e190299 100644
--- a/src/modules/machineid/machineid.conf
+++ b/src/modules/machineid/machineid.conf
@@ -11,21 +11,39 @@
 #
 ---
 # Whether to create /etc/machine-id for systemd.
+# The default is *false*.
 systemd: true
 
 # Whether to create /var/lib/dbus/machine-id for D-Bus.
+# The default is *false*.
 dbus: true
 # Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id
 # (ignored if dbus is false, or if there is no /etc/machine-id to point to).
+# The default is *false*.
 dbus-symlink: true
 
-# Whether to create an entropy file /var/lib/urandom/random-seed
-#
-# DEPRECATED: list the file in entropy-files instead
-entropy: false
-# Whether to copy entropy from the host
+# Copy entropy from the host? If this is set to *true*, then
+# any entropy file listed below will be copied from the host
+# if it exists. Non-existent files will be generated from
+# /dev/urandom . The default is *false*.
 entropy-copy: false
-# Which files to write (paths in the target)
+# Which files to write (paths in the target). Each of these files is
+# either generated from /dev/urandom or copied from the host, depending
+# on the setting for *entropy-copy*, above.
 entropy-files:
     - /var/lib/urandom/random-seed
     - /var/lib/systemd/random-seed
+
+# Whether to create an entropy file /var/lib/urandom/random-seed
+#
+# DEPRECATED: list the file in entropy-files instead. If this key
+# exists and is set to *true*, a warning is printed and Calamares
+# behaves as if `/var/lib/urandom/random-seed` is listed in *entropy-files*.
+#
+# entropy: false
+
+# Whether to create a symlink for D-Bus
+#
+# DEPRECATED: set *dbus-symlink* with the same meaning instead.
+#
+# symlink: false
diff --git a/src/modules/machineid/machineid.schema.yaml b/src/modules/machineid/machineid.schema.yaml
index 1ae67e132..59bb5f81b 100644
--- a/src/modules/machineid/machineid.schema.yaml
+++ b/src/modules/machineid/machineid.schema.yaml
@@ -6,11 +6,11 @@ $id: https://calamares.io/schemas/machineid
 additionalProperties: false
 type: object
 properties:
-    systemd: { type: boolean, default: true }
-    dbus: { type: boolean, default: true }
-    "dbus-symlink": { type: boolean, default: true }
+    systemd: { type: boolean, default: false }
+    dbus: { type: boolean, default: false }
+    "dbus-symlink": { type: boolean, default: false }
     "entropy-copy": { type: boolean, default: false }
     "entropy-files": { type: array, items: { type: string } }
     # Deprecated properties
-    symlink: { type: boolean, default: true }
+    symlink: { type: boolean, default: false }
     entropy: { type: boolean, default: false }

From 697ee6f65fcb6562fb5afd07f4ed54b7be5106ec Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 17:16:37 +0200
Subject: [PATCH 039/228] CI: accept clang-format90 (FreeBSD naming style)

---
 ci/calamaresstyle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/calamaresstyle b/ci/calamaresstyle
index bd715eee1..42adc33cc 100755
--- a/ci/calamaresstyle
+++ b/ci/calamaresstyle
@@ -22,7 +22,7 @@ export LANG LC_ALL LC_NUMERIC
 
 AS=$( which astyle )
 
-CF_VERSIONS="clang-format-7 clang-format-8 clang-format70 clang-format80 clang-format-9.0.1 clang-format"
+CF_VERSIONS="clang-format-7 clang-format-8 clang-format70 clang-format80 clang-format90 clang-format-9.0.1 clang-format"
 for _cf in $CF_VERSIONS
 do
 	# Not an error if this particular clang-format isn't found

From 51b47862cded5f358ef592b9f96128fd23779481 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 22:23:10 +0200
Subject: [PATCH 040/228] [partition] Mark destructors `override`

This reduces compiler warnings related to virtual-overriding
functions: all the destructors are virtual.
---
 src/modules/partition/core/Config.h                     | 2 +-
 src/modules/partition/core/PartitionCoreModule.h        | 2 +-
 src/modules/partition/gui/ChoicePage.h                  | 2 +-
 src/modules/partition/gui/CreatePartitionDialog.h       | 2 +-
 src/modules/partition/gui/EditExistingPartitionDialog.h | 2 +-
 src/modules/partition/gui/PartitionPage.h               | 2 +-
 src/modules/partition/gui/ReplaceWidget.h               | 2 +-
 src/modules/partition/gui/VolumeGroupBaseDialog.h       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/modules/partition/core/Config.h b/src/modules/partition/core/Config.h
index 1629ccc22..57230b6e8 100644
--- a/src/modules/partition/core/Config.h
+++ b/src/modules/partition/core/Config.h
@@ -28,7 +28,7 @@ class Config : public QObject
 
 public:
     Config( QObject* parent );
-    virtual ~Config() = default;
+    ~Config() override = default;
 
     enum InstallChoice
     {
diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
index 1dc61db6f..1e4179b97 100644
--- a/src/modules/partition/core/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -85,7 +85,7 @@ public:
     };
 
     PartitionCoreModule( QObject* parent = nullptr );
-    ~PartitionCoreModule();
+    ~PartitionCoreModule() override;
 
     /**
      * @brief init performs a devices scan and initializes all KPMcore data
diff --git a/src/modules/partition/gui/ChoicePage.h b/src/modules/partition/gui/ChoicePage.h
index 118f23a46..1bdee10ea 100644
--- a/src/modules/partition/gui/ChoicePage.h
+++ b/src/modules/partition/gui/ChoicePage.h
@@ -54,7 +54,7 @@ class ChoicePage : public QWidget, private Ui::ChoicePage
     Q_OBJECT
 public:
     explicit ChoicePage( Config* config, QWidget* parent = nullptr );
-    virtual ~ChoicePage();
+    ~ChoicePage() override;
 
     /**
      * @brief init runs when the PartitionViewStep and the PartitionCoreModule are
diff --git a/src/modules/partition/gui/CreatePartitionDialog.h b/src/modules/partition/gui/CreatePartitionDialog.h
index dc756d352..bee70f61b 100644
--- a/src/modules/partition/gui/CreatePartitionDialog.h
+++ b/src/modules/partition/gui/CreatePartitionDialog.h
@@ -45,7 +45,7 @@ public:
                            Partition* partition,
                            const QStringList& usedMountPoints,
                            QWidget* parentWidget = nullptr );
-    ~CreatePartitionDialog();
+    ~CreatePartitionDialog() override;
 
     /**
      * Must be called when user wants to create a partition in
diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.h b/src/modules/partition/gui/EditExistingPartitionDialog.h
index 96cc2c4c4..89b5b55e4 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.h
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.h
@@ -36,7 +36,7 @@ public:
                                  Partition* partition,
                                  const QStringList& usedMountPoints,
                                  QWidget* parentWidget = nullptr );
-    ~EditExistingPartitionDialog();
+    ~EditExistingPartitionDialog() override;
 
     void applyChanges( PartitionCoreModule* module );
 
diff --git a/src/modules/partition/gui/PartitionPage.h b/src/modules/partition/gui/PartitionPage.h
index 26c7dbccf..81c2cd983 100644
--- a/src/modules/partition/gui/PartitionPage.h
+++ b/src/modules/partition/gui/PartitionPage.h
@@ -34,7 +34,7 @@ class PartitionPage : public QWidget
     Q_OBJECT
 public:
     explicit PartitionPage( PartitionCoreModule* core, QWidget* parent = nullptr );
-    ~PartitionPage();
+    ~PartitionPage() override;
 
     void onRevertClicked();
 
diff --git a/src/modules/partition/gui/ReplaceWidget.h b/src/modules/partition/gui/ReplaceWidget.h
index 5277e5626..fbd19b429 100644
--- a/src/modules/partition/gui/ReplaceWidget.h
+++ b/src/modules/partition/gui/ReplaceWidget.h
@@ -27,7 +27,7 @@ class ReplaceWidget : public QWidget
     Q_OBJECT
 public:
     explicit ReplaceWidget( PartitionCoreModule* core, QComboBox* devicesComboBox, QWidget* parent = nullptr );
-    virtual ~ReplaceWidget();
+    virtual ~ReplaceWidget() override;
 
     bool isNextEnabled() const;
 
diff --git a/src/modules/partition/gui/VolumeGroupBaseDialog.h b/src/modules/partition/gui/VolumeGroupBaseDialog.h
index 253160d97..94ed0b98b 100644
--- a/src/modules/partition/gui/VolumeGroupBaseDialog.h
+++ b/src/modules/partition/gui/VolumeGroupBaseDialog.h
@@ -30,7 +30,7 @@ class VolumeGroupBaseDialog : public QDialog
 
 public:
     explicit VolumeGroupBaseDialog( QString& vgName, QVector< const Partition* > pvList, QWidget* parent = nullptr );
-    ~VolumeGroupBaseDialog();
+    ~VolumeGroupBaseDialog() override;
 
 protected:
     virtual void updateOkButton();

From 44a11bd93b12037c491002dae77e8b31024a7a3e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 22:27:30 +0200
Subject: [PATCH 041/228] [partition] Initialize in the initializer list, if
 possible

---
 src/modules/partition/core/PartitionLayout.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 182e7606b..67a7c2906 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -44,13 +44,13 @@ getDefaultFileSystemType()
 }
 
 PartitionLayout::PartitionLayout()
+    : m_defaultFsType( getDefaultFileSystemType() )
 {
-    m_defaultFsType = getDefaultFileSystemType();
 }
 
 PartitionLayout::PartitionLayout( PartitionLayout::PartitionEntry entry )
+    : PartitionLayout()
 {
-    m_defaultFsType = getDefaultFileSystemType();
     m_partLayout.append( entry );
 }
 

From 687a795b71f4d035ef6ce3b8f3d193f26d596817 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 22:31:22 +0200
Subject: [PATCH 042/228] [partition] Warnings-- by initialization order

---
 src/modules/partition/core/PartitionLayout.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 67a7c2906..1b4e49bd6 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -82,10 +82,10 @@ PartitionLayout::PartitionEntry::PartitionEntry()
 }
 
 PartitionLayout::PartitionEntry::PartitionEntry( const QString& size, const QString& min, const QString& max )
-    : partSize( size )
+    : partAttributes( 0 )
+    , partSize( size )
     , partMinSize( min )
     , partMaxSize( max )
-    , partAttributes( 0 )
 {
 }
 

From 9910b23152e5f2bc70488de8e24044be668d34c1 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 22:34:53 +0200
Subject: [PATCH 043/228] [partition] Avoid uninitialized variable

- if the partition size is invalid, then warn about it but do
  not print the (uninitialized) size of the partition.
- shuffle code to continue earlier, allowing the "good path"
  code to be out-dented.
---
 .../partition/core/PartitionLayout.cpp        | 42 +++++++++----------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 1b4e49bd6..d42e7b568 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -172,32 +172,30 @@ PartitionLayout::execute( Device* dev,
     // Let's check if we have enough space for each partSize
     for ( const auto& part : qAsConst( m_partLayout ) )
     {
-        qint64 size;
-        // Calculate partition size
-
-        if ( part.partSize.isValid() )
+        if ( !part.partSize.isValid() )
         {
-            // We need to ignore the percent-defined
-            if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent )
-            {
-                size = part.partSize.toSectors( totalSize, dev->logicalSize() );
-            }
-            else
-            {
-                if ( part.partMinSize.isValid() )
-                {
-                    size = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
-                }
-                else
-                {
-                    size = 0;
-                }
-            }
+            cWarning() << "Partition" << part.partMountPoint << "size is invalid, skipping...";
+            continue;
+        }
+
+        // Calculate partition size: Rely on "possibly uninitialized use"
+        // warnings to ensure that all the cases are covered below.
+        qint64 size;
+        // We need to ignore the percent-defined until later
+        if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent )
+        {
+            size = part.partSize.toSectors( totalSize, dev->logicalSize() );
         }
         else
         {
-            cWarning() << "Partition" << part.partMountPoint << "size (" << size << "sectors) is invalid, skipping...";
-            continue;
+            if ( part.partMinSize.isValid() )
+            {
+                size = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
+            }
+            else
+            {
+                size = 0;
+            }
         }
 
         partSizeMap.insert( &part, size );

From eb8e95bb8734541f89a871c6a1231ea3d3e857e5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 22:39:05 +0200
Subject: [PATCH 044/228] [partition] Warnings--, explain why we're using a
 void*

---
 src/modules/partition/core/PartUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index e6c1a520d..39d593f98 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -59,7 +59,7 @@ convenienceName( const Partition* const candidate )
 
     QString p;
     QTextStream s( &p );
-    s << (void*)candidate;
+    s << (void*)(candidate);  // No good name available, use pointer address
 
     return p;
 }

From d7e64de24a65ffda3416926d550821ee9775c18f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 23 Oct 2020 23:14:00 +0200
Subject: [PATCH 045/228] [partition] Adjust docs to function

- @params referring to things that don't exist
- @brief that is 3 lines long
---
 src/modules/partition/gui/ChoicePage.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 897f89165..a91c9a8e1 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -845,10 +845,11 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
 
 
 /**
- * @brief ChoicePage::updateDeviceStatePreview clears and rebuilds the contents of the
- *      preview widget for the current on-disk state. This also triggers a rescan in the
- *      PCM to get a Device* copy that's unaffected by subsequent PCM changes.
- * @param currentDevice a pointer to the selected Device.
+ * @brief clear and then rebuild the contents of the preview widget
+ *
+ * The preview widget for the current disk is completely re-constructed
+ * based on the on-disk state. This also triggers a rescan in the
+ * PCM to get a Device* copy that's unaffected by subsequent PCM changes.
  */
 void
 ChoicePage::updateDeviceStatePreview()
@@ -916,10 +917,10 @@ ChoicePage::updateDeviceStatePreview()
 
 
 /**
- * @brief ChoicePage::updateActionChoicePreview clears and rebuilds the contents of the
- *      preview widget for the current PCM-proposed state. No rescans here, this should
- *      be immediate.
- * @param currentDevice a pointer to the selected Device.
+ * @brief rebuild the contents of the preview for the PCM-proposed state.
+ *
+ * No rescans here, this should be immediate.
+ *
  * @param choice the chosen partitioning action.
  */
 void

From 6605e11394a3f7149aaa0eb7236a8f266e7cf79b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 02:05:14 +0200
Subject: [PATCH 046/228] [partition] Warnings-- in test: don't expose internal
 variable

---
 src/modules/partition/tests/PartitionJobTests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp
index 60e72e006..2b0b1a1dc 100644
--- a/src/modules/partition/tests/PartitionJobTests.cpp
+++ b/src/modules/partition/tests/PartitionJobTests.cpp
@@ -156,7 +156,7 @@ QueueRunner::onFailed( const QString& message, const QString& details )
     QFAIL( qPrintable( msg ) );
 }
 
-CalamaresUtils::Partition::KPMManager* kpmcore = nullptr;
+static CalamaresUtils::Partition::KPMManager* kpmcore = nullptr;
 
 //- PartitionJobTests ------------------------------------------------------------------
 PartitionJobTests::PartitionJobTests()

From 01b75ef4b51de7a8904652a4af73bef00f91055e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 02:19:05 +0200
Subject: [PATCH 047/228] [partition] Use C++-style cast

---
 src/modules/partition/core/PartUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 39d593f98..a514b9c34 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -59,7 +59,7 @@ convenienceName( const Partition* const candidate )
 
     QString p;
     QTextStream s( &p );
-    s << (void*)(candidate);  // No good name available, use pointer address
+    s << static_cast<const void*>(candidate);  // No good name available, use pointer address
 
     return p;
 }

From 89b1f8d96b7ac01d3e082f614cfaecb3420bb7fd Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 02:21:32 +0200
Subject: [PATCH 048/228] [partition] Warnings-- in tests related to virtual
 destructors

---
 src/modules/partition/tests/CreateLayoutsTests.cpp | 4 ++++
 src/modules/partition/tests/CreateLayoutsTests.h   | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index 7589b5b65..dcfc01f5a 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -156,3 +156,7 @@ TestDevice::TestDevice( const QString& name, const qint64 logicalSectorSize, con
 {
 }
 #endif
+
+TestDevice::~TestDevice()
+{
+}
diff --git a/src/modules/partition/tests/CreateLayoutsTests.h b/src/modules/partition/tests/CreateLayoutsTests.h
index 98d2d8cb9..2ecc7b634 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.h
+++ b/src/modules/partition/tests/CreateLayoutsTests.h
@@ -18,6 +18,7 @@ class CreateLayoutsTests : public QObject
     Q_OBJECT
 public:
     CreateLayoutsTests();
+    ~CreateLayoutsTests() override = default;
 
 private Q_SLOTS:
     void testFixedSizePartition();
@@ -31,6 +32,7 @@ class TestDevice : public Device
 {
 public:
     TestDevice( const QString& name, const qint64 logicalSectorSize, const qint64 totalLogicalSectors );
+    ~TestDevice() override;
 };
 
 #endif

From 27f6eaaf7585a0bb46f623a034c54c161d607eab Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 02:24:37 +0200
Subject: [PATCH 049/228] [partition] Remove unused variables

---
 src/modules/partition/core/PartitionCoreModule.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 3d726aef1..3327eb50b 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -110,7 +110,7 @@ updatePreview( Job* job, const std::true_type& )
 
 template < typename Job >
 void
-updatePreview( Job* job, const std::false_type& )
+updatePreview( Job*, const std::false_type& )
 {
 }
 
@@ -483,7 +483,6 @@ PartitionCoreModule::deletePartition( Device* device, Partition* partition )
         }
     }
 
-    const Calamares::JobList& jobs = deviceInfo->jobs();
     if ( partition->state() == KPM_PARTITION_STATE( New ) )
     {
         // Take all the SetPartFlagsJob from the list and delete them

From 00fa911f72d8897a73ba4d6dd1eca7b64efdd325 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 02:31:38 +0200
Subject: [PATCH 050/228] CMake: switch to C++17

---
 CHANGES        | 4 +++-
 CMakeLists.txt | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 911f7156e..ac8bf5855 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,7 +13,9 @@ This release contains contributions from (alphabetically by first name):
  - No external contributors yet
 
 ## Core ##
- - No core changes yet
+ - Calamares now sets the C++ standard for compilation to C++17; this
+   is for better compatibility and fewer warnings when building with
+   modern KDE Frameworks and KPMcore 4.2.0.
 
 ## Modules ##
  - No module changes yet
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99f6cd42a..01cad1eec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -190,7 +190,7 @@ include( CMakeColors )
 
 ### C++ SETUP
 #
-set( CMAKE_CXX_STANDARD 14 )
+set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
 set( CMAKE_C_STANDARD 99 )
 set( CMAKE_C_STANDARD_REQUIRED ON )

From 6c7d29571277f073a03138c0c02ed7e4d7bed89b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 12:32:07 +0200
Subject: [PATCH 051/228] CMake: simplify C and C++ flags

- reduce the difference between clang and g++ builds, factor
  common flags out of the CMake-if
- drop special boost-warning-suppression, we do that differently
  most of the time in the affected source files
---
 CMakeLists.txt                  | 34 +++++++++++++++------------------
 src/libcalamares/CMakeLists.txt |  3 ---
 2 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01cad1eec..c289d523e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,21 +192,28 @@ include( CMakeColors )
 #
 set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
+set( CMAKE_CXX_FLAGS                "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type -Wl,--no-undefined" )
+set( CMAKE_CXX_FLAGS_DEBUG          "-g ${CMAKE_CXX_FLAGS_DEBUG}" )
+set( CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG" )
+set( CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG" )
+set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" )
+
 set( CMAKE_C_STANDARD 99 )
 set( CMAKE_C_STANDARD_REQUIRED ON )
-
 set( CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS} -Wall" )
+set( CMAKE_C_FLAGS_DEBUG            "-g" )
+set( CMAKE_C_FLAGS_MINSIZEREL       "-Os -DNDEBUG" )
+set( CMAKE_C_FLAGS_RELEASE          "-O4 -DNDEBUG" )
+set( CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" )
+
+set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
+
 if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." )
-    set( CMAKE_C_FLAGS                  "${CMAKE_C_FLAGS} -Wall" )
-    set( CMAKE_C_FLAGS_DEBUG            "-g" )
-    set( CMAKE_C_FLAGS_MINSIZEREL       "-Os -DNDEBUG" )
-    set( CMAKE_C_FLAGS_RELEASE          "-O4 -DNDEBUG" )
-    set( CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" )
 
     # Clang warnings: doing *everything* is counter-productive, since it warns
     # about things which we can't fix (e.g. C++98 incompatibilities, but
-    # Calamares is C++14).
+    # Calamares is C++17).
     foreach( CLANG_WARNINGS
         -Weverything
         -Wno-c++98-compat
@@ -218,7 +225,6 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
         -Wno-missing-prototypes
         -Wno-documentation-unknown-command
         -Wno-unknown-warning-option
-        -Werror=return-type
     )
         string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" )
     endforeach()
@@ -229,27 +235,17 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     #       mark_thirdparty_code( <file> [<file>...] )
     # to switch off warnings for those sources.
     set( SUPPRESS_3RDPARTY_WARNINGS "-Wno-everything" )
-    set( SUPPRESS_BOOST_WARNINGS " -Wno-zero-as-null-pointer-constant -Wno-disabled-macro-expansion" )
-
-    set( CMAKE_CXX_FLAGS_DEBUG          "-g ${CMAKE_CXX_FLAGS_DEBUG}" )
-    set( CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG" )
-    set( CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG" )
-    set( CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g" )
 
     set( CMAKE_TOOLCHAIN_PREFIX "llvm-" )
 
-    set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-
     # The path prefix is only relevant for CMake 3.16 and later, fixes #1286
     set( CMAKE_AUTOMOC_PATH_PREFIX OFF )
     set( CALAMARES_AUTOMOC_OPTIONS "-butils/moc-warnings.h" )
     set( CALAMARES_AUTOUIC_OPTIONS --include utils/moc-warnings.h )
 else()
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--no-undefined" )
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual -Werror=return-type" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual" )
 
     set( SUPPRESS_3RDPARTY_WARNINGS "" )
-    set( SUPPRESS_BOOST_WARNINGS "" )
 
     set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='__builtin_unreachable();' -DFALLTHRU='/* */'" )
 endif()
diff --git a/src/libcalamares/CMakeLists.txt b/src/libcalamares/CMakeLists.txt
index a8b96065f..3964eb3e6 100644
--- a/src/libcalamares/CMakeLists.txt
+++ b/src/libcalamares/CMakeLists.txt
@@ -86,9 +86,6 @@ if( WITH_PYTHON )
         PythonJob.cpp
         PythonJobApi.cpp
     )
-    set_source_files_properties( PythonJob.cpp
-        PROPERTIES COMPILE_FLAGS "${SUPPRESS_BOOST_WARNINGS}"
-    )
 
     include_directories(${PYTHON_INCLUDE_DIRS})
     link_directories(${PYTHON_LIBRARIES})

From b28a50de6fa805e608bd0d534fe825ba1a57e5fb Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 12:35:19 +0200
Subject: [PATCH 052/228] [libcalamares] Remove useless variable

- describe() is for debugging purposes, doesn't need to calculate
  whether the requirements are accepted.
---
 src/libcalamares/modulesystem/RequirementsModel.cpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/libcalamares/modulesystem/RequirementsModel.cpp b/src/libcalamares/modulesystem/RequirementsModel.cpp
index 9dfab0c8f..6a7e0a5b4 100644
--- a/src/libcalamares/modulesystem/RequirementsModel.cpp
+++ b/src/libcalamares/modulesystem/RequirementsModel.cpp
@@ -85,16 +85,11 @@ void
 RequirementsModel::describe() const
 {
     cDebug() << "Requirements model has" << m_requirements.count() << "items";
-    bool acceptable = true;
     int count = 0;
     for ( const auto& r : m_requirements )
     {
         cDebug() << Logger::SubEntry << "requirement" << count << r.name << "satisfied?" << r.satisfied << "mandatory?"
                  << r.mandatory;
-        if ( r.mandatory && !r.satisfied )
-        {
-            acceptable = false;
-        }
         ++count;
     }
 }

From 84936a95fcdfcace8a56f15ad6237dfaffd4544c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 12:49:56 +0200
Subject: [PATCH 053/228] [libcalamaresui] Warnings-- for Qt 5.15 deprecations

Introduce a GUI-oriented compatibility header that introduces aliases
for some enum values that are deprecated in Qt 5.15
---
 src/libcalamaresui/utils/QtCompat.h           | 42 +++++++++++++++++++
 src/modules/license/LicenseWidget.cpp         |  3 +-
 src/modules/partition/gui/BootInfoWidget.cpp  |  3 +-
 .../partition/gui/DeviceInfoWidget.cpp        |  4 +-
 .../partition/gui/PartitionViewStep.cpp       |  3 +-
 src/modules/summary/SummaryPage.cpp           |  3 +-
 6 files changed, 52 insertions(+), 6 deletions(-)
 create mode 100644 src/libcalamaresui/utils/QtCompat.h

diff --git a/src/libcalamaresui/utils/QtCompat.h b/src/libcalamaresui/utils/QtCompat.h
new file mode 100644
index 000000000..d53c01e0b
--- /dev/null
+++ b/src/libcalamaresui/utils/QtCompat.h
@@ -0,0 +1,42 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+/**@file Handle compatibility and deprecations across Qt versions
+ *
+ * Since Calamares is supposed to work with Qt 5.9 or later, it covers a
+ * lot of changes in the Qt API. Especially the later Qt 5.15 (last LTS)
+ * versions deprecate a number of enum values and parts of the QWidgets
+ * API. This file adjusts for that by introducing suitable aliases
+ * and workaround-functions.
+ *
+ * For a similar approach for QtCore, see libcalamares/utils/String.h
+ */
+
+#ifndef UTILS_QTCOMPAT_H
+#define UTILS_QTCOMPAT_H
+
+#include <QPalette>
+
+/* Avoid warnings about QPalette changes */
+constexpr static const auto WindowBackground =
+#if QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 )
+    QPalette::Background
+#else
+    QPalette::Window
+#endif
+    ;
+
+constexpr static const auto WindowText =
+#if QT_VERSION < QT_VERSION_CHECK( 5, 15, 0 )
+    QPalette::Foreground
+#else
+    QPalette::WindowText
+#endif
+    ;
+
+#endif
diff --git a/src/modules/license/LicenseWidget.cpp b/src/modules/license/LicenseWidget.cpp
index b2e66515d..a8d581ab5 100644
--- a/src/modules/license/LicenseWidget.cpp
+++ b/src/modules/license/LicenseWidget.cpp
@@ -13,6 +13,7 @@
 #include "LicenseWidget.h"
 
 #include "utils/Logger.h"
+#include "utils/QtCompat.h"
 
 #include <QDesktopServices>
 #include <QFile>
@@ -48,7 +49,7 @@ LicenseWidget::LicenseWidget( LicenseEntry entry, QWidget* parent )
     , m_isExpanded( m_entry.expandByDefault() )
 {
     QPalette pal( palette() );
-    pal.setColor( QPalette::Background, palette().window().color().lighter( 108 ) );
+    pal.setColor( WindowBackground, palette().window().color().lighter( 108 ) );
 
     setObjectName( "licenseItem" );
 
diff --git a/src/modules/partition/gui/BootInfoWidget.cpp b/src/modules/partition/gui/BootInfoWidget.cpp
index 5d9dcf8b5..0b9d08c47 100644
--- a/src/modules/partition/gui/BootInfoWidget.cpp
+++ b/src/modules/partition/gui/BootInfoWidget.cpp
@@ -12,6 +12,7 @@
 #include "core/PartUtils.h"
 
 #include "utils/CalamaresUtilsGui.h"
+#include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
 
 #include <QDir>
@@ -45,7 +46,7 @@ BootInfoWidget::BootInfoWidget( QWidget* parent )
     m_bootLabel->setAlignment( Qt::AlignCenter );
 
     QPalette palette;
-    palette.setBrush( QPalette::Foreground, QColor( "#4D4D4D" ) );  //dark grey
+    palette.setBrush( WindowText, QColor( "#4D4D4D" ) );  //dark grey
 
     m_bootIcon->setAutoFillBackground( true );
     m_bootLabel->setAutoFillBackground( true );
diff --git a/src/modules/partition/gui/DeviceInfoWidget.cpp b/src/modules/partition/gui/DeviceInfoWidget.cpp
index 80eacd05b..708982101 100644
--- a/src/modules/partition/gui/DeviceInfoWidget.cpp
+++ b/src/modules/partition/gui/DeviceInfoWidget.cpp
@@ -7,13 +7,13 @@
  *
  */
 
-
 #include "DeviceInfoWidget.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
+#include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
 
 #include <QDir>
@@ -47,7 +47,7 @@ DeviceInfoWidget::DeviceInfoWidget( QWidget* parent )
     m_ptLabel->setAlignment( Qt::AlignCenter );
 
     QPalette palette;
-    palette.setBrush( QPalette::Foreground, QColor( "#4D4D4D" ) );  //dark grey
+    palette.setBrush( WindowText, QColor( "#4D4D4D" ) );  //dark grey
 
     m_ptIcon->setAutoFillBackground( true );
     m_ptLabel->setAutoFillBackground( true );
diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 20c7d0f08..63227e3b7 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -34,6 +34,7 @@
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
 #include "utils/NamedEnum.h"
+#include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
 #include "utils/Variant.h"
 #include "widgets/WaitingWidget.h"
@@ -273,7 +274,7 @@ PartitionViewStep::createSummaryWidget() const
         jobsLabel->setText( jobsLines.join( "<br/>" ) );
         jobsLabel->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
         QPalette pal;
-        pal.setColor( QPalette::Background, pal.window().color().lighter( 108 ) );
+        pal.setColor( WindowBackground, pal.window().color().lighter( 108 ) );
         jobsLabel->setAutoFillBackground( true );
         jobsLabel->setPalette( pal );
     }
diff --git a/src/modules/summary/SummaryPage.cpp b/src/modules/summary/SummaryPage.cpp
index d6917d962..96781c25e 100644
--- a/src/modules/summary/SummaryPage.cpp
+++ b/src/modules/summary/SummaryPage.cpp
@@ -19,6 +19,7 @@
 
 #include "utils/CalamaresUtilsGui.h"
 #include "utils/Logger.h"
+#include "utils/QtCompat.h"
 #include "utils/Retranslator.h"
 #include "viewpages/ExecutionViewStep.h"
 
@@ -183,7 +184,7 @@ SummaryPage::createBodyLabel( const QString& text ) const
     QLabel* label = new QLabel;
     label->setMargin( CalamaresUtils::defaultFontHeight() / 2 );
     QPalette pal( palette() );
-    pal.setColor( QPalette::Background, palette().window().color().lighter( 108 ) );
+    pal.setColor( WindowBackground, palette().window().color().lighter( 108 ) );
     label->setAutoFillBackground( true );
     label->setPalette( pal );
     label->setText( text );

From 7fa1c1b787143f4a1dcc9bc9e1e77318620403e6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 13:19:42 +0200
Subject: [PATCH 054/228] [libcalamares] Avoid object-slice

g++ warns that error_already_set is polymorphic, and we're catching
by-value (although we don't use that value). Avoid that.
---
 src/libcalamares/PythonJob.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libcalamares/PythonJob.cpp b/src/libcalamares/PythonJob.cpp
index cd066b8bd..6944f38e5 100644
--- a/src/libcalamares/PythonJob.cpp
+++ b/src/libcalamares/PythonJob.cpp
@@ -284,7 +284,7 @@ PythonJob::exec()
             return JobResult::error( message, description );
         }
     }
-    catch ( bp::error_already_set )
+    catch ( bp::error_already_set& )
     {
         QString msg;
         if ( PyErr_Occurred() )

From 364d50679fa1618c1bd9868676f13fa5a76485f9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 16:28:06 +0200
Subject: [PATCH 055/228] CMake: don't put linker flags in compile-flags
 variables

---
 CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c289d523e..67d7637f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -192,7 +192,7 @@ include( CMakeColors )
 #
 set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
-set( CMAKE_CXX_FLAGS                "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type -Wl,--no-undefined" )
+set( CMAKE_CXX_FLAGS                "${CMAKE_CXX_FLAGS} -Wall -Werror=return-type" )
 set( CMAKE_CXX_FLAGS_DEBUG          "-g ${CMAKE_CXX_FLAGS_DEBUG}" )
 set( CMAKE_CXX_FLAGS_MINSIZEREL     "-Os -DNDEBUG" )
 set( CMAKE_CXX_FLAGS_RELEASE        "-O3 -DNDEBUG" )
@@ -206,7 +206,7 @@ set( CMAKE_C_FLAGS_MINSIZEREL       "-Os -DNDEBUG" )
 set( CMAKE_C_FLAGS_RELEASE          "-O4 -DNDEBUG" )
 set( CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g" )
 
-set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
+set( CMAKE_SHARED_LINKER_FLAGS      "-Wl,--no-undefined -Wl,--fatal-warnings" )
 
 if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     message( STATUS "Found Clang ${CMAKE_CXX_COMPILER_VERSION}, setting up Clang-specific compiler flags." )
@@ -243,7 +243,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     set( CALAMARES_AUTOMOC_OPTIONS "-butils/moc-warnings.h" )
     set( CALAMARES_AUTOUIC_OPTIONS --include utils/moc-warnings.h )
 else()
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--fatal-warnings -Wnon-virtual-dtor -Woverloaded-virtual" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual" )
 
     set( SUPPRESS_3RDPARTY_WARNINGS "" )
 

From 9a2fca7f5b0126cf22ad15f3be288e39ccc243d9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 24 Oct 2020 17:20:23 +0200
Subject: [PATCH 056/228] CMake: prefer normal C++17 [[fallthrough]] annotation

---
 CMakeLists.txt                                     | 4 ++--
 src/libcalamaresui/viewpages/ExecutionViewStep.cpp | 2 +-
 src/modules/packagechooser/PackageChooserPage.cpp  | 4 ++--
 src/modules/tracking/Config.cpp                    | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 67d7637f8..193de8c1d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,7 +228,7 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     )
         string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" )
     endforeach()
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='//' -DFALLTHRU='[[clang::fallthrough]]'")
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='//'")
 
     # Third-party code where we don't care so much about compiler warnings
     # (because it's uncomfortable to patch) get different flags; use
@@ -247,7 +247,7 @@ else()
 
     set( SUPPRESS_3RDPARTY_WARNINGS "" )
 
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='__builtin_unreachable();' -DFALLTHRU='/* */'" )
+    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='__builtin_unreachable();'" )
 endif()
 
 # Use mark_thirdparty_code() to reduce warnings from the compiler
diff --git a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
index e3498c62d..bb629b217 100644
--- a/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
+++ b/src/libcalamaresui/viewpages/ExecutionViewStep.cpp
@@ -42,7 +42,7 @@ makeSlideshow( QWidget* parent )
         return new Calamares::SlideshowPictures( parent );
 #ifdef WITH_QML
     case 1:
-        FALLTHRU;
+        [[fallthrough]];
     case 2:
         return new Calamares::SlideshowQML( parent );
 #endif
diff --git a/src/modules/packagechooser/PackageChooserPage.cpp b/src/modules/packagechooser/PackageChooserPage.cpp
index 0d5df8177..e46809fdd 100644
--- a/src/modules/packagechooser/PackageChooserPage.cpp
+++ b/src/modules/packagechooser/PackageChooserPage.cpp
@@ -33,12 +33,12 @@ PackageChooserPage::PackageChooserPage( PackageChooserMode mode, QWidget* parent
     switch ( mode )
     {
     case PackageChooserMode::Optional:
-        FALLTHRU;
+        [[fallthrough]];
     case PackageChooserMode::Required:
         ui->products->setSelectionMode( QAbstractItemView::SingleSelection );
         break;
     case PackageChooserMode::OptionalMultiple:
-        FALLTHRU;
+        [[fallthrough]];
     case PackageChooserMode::RequiredMultiple:
         ui->products->setSelectionMode( QAbstractItemView::ExtendedSelection );
     }
diff --git a/src/modules/tracking/Config.cpp b/src/modules/tracking/Config.cpp
index f1f61edfd..0d9778c6a 100644
--- a/src/modules/tracking/Config.cpp
+++ b/src/modules/tracking/Config.cpp
@@ -182,10 +182,10 @@ enableLevelsBelow( Config* config, TrackingType level )
     {
     case TrackingType::UserTracking:
         config->userTracking()->setTracking( TrackingStyleConfig::TrackingState::EnabledByUser );
-        FALLTHRU;
+        [[fallthrough]];
     case TrackingType::MachineTracking:
         config->machineTracking()->setTracking( TrackingStyleConfig::TrackingState::EnabledByUser );
-        FALLTHRU;
+        [[fallthrough]];
     case TrackingType::InstallTracking:
         config->installTracking()->setTracking( TrackingStyleConfig::TrackingState::EnabledByUser );
         break;

From 2b9fa0f982b31f0c0a891b9c077346398a1ec751 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 25 Oct 2020 12:48:12 +0100
Subject: [PATCH 057/228] CMake: drop the NOTREACHED macro

 - both clang and g++ support __builtin_unreachable(); (as Kevin
   Kofler pointed out) so we don't need the macro to do different things;
 - the compilers have gotten better at detecting unreachable code,
   so instead of inserting macros or fiddly bits, just drop them
   and the unreachable code they comment.
---
 CMakeLists.txt                                        | 3 ---
 src/calamares/CalamaresWindow.cpp                     | 1 -
 src/libcalamares/geoip/Handler.cpp                    | 1 -
 src/libcalamares/partition/PartitionSize.cpp          | 9 ---------
 src/libcalamares/utils/Yaml.cpp                       | 3 ---
 src/modules/netinstall/Config.cpp                     | 1 -
 src/modules/netinstall/NetInstallViewStep.cpp         | 2 +-
 src/modules/packagechooser/PackageChooserViewStep.cpp | 2 --
 8 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 193de8c1d..a83ed6dd8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -228,7 +228,6 @@ if( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
     )
         string( APPEND CMAKE_CXX_FLAGS " ${CLANG_WARNINGS}" )
     endforeach()
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='//'")
 
     # Third-party code where we don't care so much about compiler warnings
     # (because it's uncomfortable to patch) get different flags; use
@@ -246,8 +245,6 @@ else()
     set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual" )
 
     set( SUPPRESS_3RDPARTY_WARNINGS "" )
-
-    set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNOTREACHED='__builtin_unreachable();'" )
 endif()
 
 # Use mark_thirdparty_code() to reduce warnings from the compiler
diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index 0960da10a..b062c0b4d 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -271,7 +271,6 @@ flavoredWidget( Calamares::Branding::PanelFlavor flavor,
     case Calamares::Branding::PanelFlavor::None:
         return nullptr;
     }
-    NOTREACHED return nullptr;  // All enum values handled above
 }
 
 /** @brief Adds widgets to @p layout if they belong on this @p side
diff --git a/src/libcalamares/geoip/Handler.cpp b/src/libcalamares/geoip/Handler.cpp
index 648ea69f4..68cf6ed6b 100644
--- a/src/libcalamares/geoip/Handler.cpp
+++ b/src/libcalamares/geoip/Handler.cpp
@@ -101,7 +101,6 @@ create_interface( Handler::Type t, const QString& selector )
     case Handler::Type::Fixed:
         return std::make_unique< GeoIPFixed >( selector );
     }
-    NOTREACHED return nullptr;
 }
 
 static RegionZonePair
diff --git a/src/libcalamares/partition/PartitionSize.cpp b/src/libcalamares/partition/PartitionSize.cpp
index d09cc6064..82444da6a 100644
--- a/src/libcalamares/partition/PartitionSize.cpp
+++ b/src/libcalamares/partition/PartitionSize.cpp
@@ -139,9 +139,6 @@ PartitionSize::toBytes( qint64 totalSectors, qint64 sectorSize ) const
     case SizeUnit::GiB:
         return toBytes();
     }
-
-    // notreached
-    return -1;
 }
 
 qint64
@@ -179,8 +176,6 @@ PartitionSize::toBytes( qint64 totalBytes ) const
         return toBytes();
     }
 
-    // notreached
-    return -1;
 }
 
 qint64
@@ -211,7 +206,6 @@ PartitionSize::toBytes() const
     case SizeUnit::GiB:
         return CalamaresUtils::GiBtoBytes( static_cast< unsigned long long >( value() ) );
     }
-    NOTREACHED return -1;
 }
 
 bool
@@ -237,7 +231,6 @@ PartitionSize::operator<( const PartitionSize& other ) const
     case SizeUnit::GiB:
         return ( toBytes() < other.toBytes() );
     }
-    NOTREACHED return false;
 }
 
 bool
@@ -263,7 +256,6 @@ PartitionSize::operator>( const PartitionSize& other ) const
     case SizeUnit::GiB:
         return ( toBytes() > other.toBytes() );
     }
-    NOTREACHED return false;
 }
 
 bool
@@ -289,7 +281,6 @@ PartitionSize::operator==( const PartitionSize& other ) const
     case SizeUnit::GiB:
         return ( toBytes() == other.toBytes() );
     }
-    NOTREACHED return false;
 }
 
 }  // namespace Partition
diff --git a/src/libcalamares/utils/Yaml.cpp b/src/libcalamares/utils/Yaml.cpp
index b787589c6..f999b8bb0 100644
--- a/src/libcalamares/utils/Yaml.cpp
+++ b/src/libcalamares/utils/Yaml.cpp
@@ -52,9 +52,6 @@ yamlToVariant( const YAML::Node& node )
     case YAML::NodeType::Undefined:
         return QVariant();
     }
-
-    // NOTREACHED
-    return QVariant();
 }
 
 
diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp
index ddbb36fcc..92cdcb2bf 100644
--- a/src/modules/netinstall/Config.cpp
+++ b/src/modules/netinstall/Config.cpp
@@ -43,7 +43,6 @@ Config::status() const
     case Status::FailedNetworkError:
         return tr( "Network Installation. (Disabled: Unable to fetch package lists, check your network connection)" );
     }
-    NOTREACHED return QString();
 }
 
 
diff --git a/src/modules/netinstall/NetInstallViewStep.cpp b/src/modules/netinstall/NetInstallViewStep.cpp
index beb295c32..e96d1724f 100644
--- a/src/modules/netinstall/NetInstallViewStep.cpp
+++ b/src/modules/netinstall/NetInstallViewStep.cpp
@@ -47,7 +47,7 @@ NetInstallViewStep::prettyName() const
     return m_sidebarLabel ? m_sidebarLabel->get() : tr( "Package selection" );
 
 #if defined( TABLE_OF_TRANSLATIONS )
-    NOTREACHED
+    __builtin_unreachable();
     // This is a table of "standard" labels for this module. If you use them
     // in the label: sidebar: section of the config file, the existing
     // translations can be used.
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index f162c074b..b649e6431 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -110,8 +110,6 @@ PackageChooserViewStep::isNextEnabled() const
         // exactly one OR one or more
         return m_widget->hasSelection();
     }
-
-    NOTREACHED return true;
 }
 
 

From f629826d40323e7edb0576f46ad831f5ead2549f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
Date: Sun, 25 Oct 2020 11:54:27 +0000
Subject: [PATCH 058/228] README: switch to C++17.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3049fbabc..7ad26e2c5 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ Clone Calamares from GitHub. The default branch is called *calamares*.
 git clone https://github.com/calamares/calamares.git
 ```
 
-Calamares is a KDE-Frameworks and Qt-based, C++14, CMake-built application.
+Calamares is a KDE-Frameworks and Qt-based, C++17, CMake-built application.
 The dependencies are explainged in [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## Contributing to Calamares

From 478c394d99fb395a1cd4c8913501e95b051d2034 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 25 Oct 2020 17:36:24 +0100
Subject: [PATCH 059/228] [partition] Don't needlessly expose a test symbol

---
 src/modules/partition/tests/CreateLayoutsTests.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index dcfc01f5a..12c19db5f 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -28,7 +28,7 @@ class SmartStatus;
 
 QTEST_GUILESS_MAIN( CreateLayoutsTests )
 
-CalamaresUtils::Partition::KPMManager* kpmcore = nullptr;
+static CalamaresUtils::Partition::KPMManager* kpmcore = nullptr;
 
 using CalamaresUtils::operator""_MiB;
 using CalamaresUtils::operator""_GiB;

From fea403186f95bc6dbcbea17b11b09100721ce52a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 25 Oct 2020 17:48:54 +0100
Subject: [PATCH 060/228] [libcalamares] Search for balance between warnings
 and annotations

- CI's gcc is too old to analyse a switch() for completeness,
  so the CI build fails.
---
 src/libcalamares/geoip/Handler.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libcalamares/geoip/Handler.cpp b/src/libcalamares/geoip/Handler.cpp
index 68cf6ed6b..8ef72d99b 100644
--- a/src/libcalamares/geoip/Handler.cpp
+++ b/src/libcalamares/geoip/Handler.cpp
@@ -101,6 +101,7 @@ create_interface( Handler::Type t, const QString& selector )
     case Handler::Type::Fixed:
         return std::make_unique< GeoIPFixed >( selector );
     }
+    __builtin_unreachable();
 }
 
 static RegionZonePair

From f6e6774f92b95caa3c25d5fd6f94fedeab468436 Mon Sep 17 00:00:00 2001
From: demmm <anke62@gmail.com>
Date: Sun, 25 Oct 2020 18:35:03 +0100
Subject: [PATCH 061/228] [keyboardq] fix build

---
 src/modules/keyboardq/KeyboardQmlViewStep.cpp | 41 ++-----------------
 src/modules/keyboardq/KeyboardQmlViewStep.h   |  6 +--
 2 files changed, 5 insertions(+), 42 deletions(-)

diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
index 08b72b3f4..8e4663ee8 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
@@ -2,6 +2,7 @@
  *
  *   SPDX-FileCopyrightText: 2014-2015 Teo Mrnjavac <teo@kde.org>
  *   SPDX-FileCopyrightText: 2020 Camilo Higuita <milo.h@aol.com>
+ *   SPDX-FileCopyrightText: 2020 Anke Boersma <demm@kaosx.us>
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *
  *   Calamares is Free Software: see the License-Identifier above.
@@ -10,9 +11,10 @@
 
 #include "KeyboardQmlViewStep.h"
 
+#include "Config.h"
+
 #include "GlobalStorage.h"
 #include "JobQueue.h"
-#include "utils/Variant.h"
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardQmlViewStepFactory, registerPlugin< KeyboardQmlViewStep >(); )
 
@@ -20,7 +22,6 @@ KeyboardQmlViewStep::KeyboardQmlViewStep( QObject* parent )
     : Calamares::QmlViewStep( parent )
     , m_config( new Config( this ) )
     , m_nextEnabled( false )
-    , m_writeEtcDefaultKeyboard( true )
 {
     m_config->init();
     m_nextEnabled = true;
@@ -66,7 +67,7 @@ KeyboardQmlViewStep::isAtEnd() const
 Calamares::JobList
 KeyboardQmlViewStep::jobs() const
 {
-    return m_jobs;
+    return m_config->createJobs();
 }
 
 void
@@ -79,7 +80,6 @@ void
 KeyboardQmlViewStep::onLeave()
 {
     m_config->finalize();
-    // m_jobs = m_config->createJobs( m_xOrgConfFileName, m_convertedKeymapPath, m_writeEtcDefaultKeyboard );
     m_prettyStatus = m_config->prettyStatus();
 }
 
@@ -92,39 +92,6 @@ KeyboardQmlViewStep::getConfig()
 void
 KeyboardQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    using namespace CalamaresUtils;
-
-    if ( configurationMap.contains( "xOrgConfFileName" )
-         && configurationMap.value( "xOrgConfFileName" ).type() == QVariant::String
-         && !getString( configurationMap, "xOrgConfFileName" ).isEmpty() )
-    {
-        m_xOrgConfFileName = getString( configurationMap, "xOrgConfFileName" );
-    }
-    else
-    {
-        m_xOrgConfFileName = "00-keyboard.conf";
-    }
-
-    if ( configurationMap.contains( "convertedKeymapPath" )
-         && configurationMap.value( "convertedKeymapPath" ).type() == QVariant::String
-         && !getString( configurationMap, "convertedKeymapPath" ).isEmpty() )
-    {
-        m_convertedKeymapPath = getString( configurationMap, "convertedKeymapPath" );
-    }
-    else
-    {
-        m_convertedKeymapPath = QString();
-    }
-
-    if ( configurationMap.contains( "writeEtcDefaultKeyboard" )
-         && configurationMap.value( "writeEtcDefaultKeyboard" ).type() == QVariant::Bool )
-    {
-        m_writeEtcDefaultKeyboard = getBool( configurationMap, "writeEtcDefaultKeyboard", true );
-    }
-    else
-    {
-        m_writeEtcDefaultKeyboard = true;
-    }
 
     Calamares::QmlViewStep::setConfigurationMap( configurationMap );
 }
diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.h b/src/modules/keyboardq/KeyboardQmlViewStep.h
index 4571a9a60..09390d8d9 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.h
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.h
@@ -19,6 +19,7 @@
 
 #include <QObject>
 
+class Config;
 class KeyboardPage;
 
 class PLUGINDLLEXPORT KeyboardQmlViewStep : public Calamares::QmlViewStep
@@ -50,11 +51,6 @@ private:
     bool m_nextEnabled;
     QString m_prettyStatus;
 
-    QString m_xOrgConfFileName;
-    QString m_convertedKeymapPath;
-    bool m_writeEtcDefaultKeyboard;
-
-    Calamares::JobList m_jobs;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardQmlViewStepFactory )

From 98c7cec732ba76349c3b06bc076b91fadcd68625 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 25 Oct 2020 18:52:38 +0100
Subject: [PATCH 062/228] CMake: restore NOTREACHED, without the macro-mess

- gcc (up to at least version 10) is worse at recognizing that all
  cases have been handled, so it complains about all the switches
  that cover enum values.
---
 src/calamares/CalamaresWindow.cpp                     | 1 +
 src/libcalamares/partition/PartitionSize.cpp          | 7 ++++++-
 src/libcalamares/utils/Yaml.cpp                       | 1 +
 src/modules/netinstall/Config.cpp                     | 1 +
 src/modules/packagechooser/PackageChooserViewStep.cpp | 1 +
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/calamares/CalamaresWindow.cpp b/src/calamares/CalamaresWindow.cpp
index b062c0b4d..a141317e0 100644
--- a/src/calamares/CalamaresWindow.cpp
+++ b/src/calamares/CalamaresWindow.cpp
@@ -271,6 +271,7 @@ flavoredWidget( Calamares::Branding::PanelFlavor flavor,
     case Calamares::Branding::PanelFlavor::None:
         return nullptr;
     }
+    __builtin_unreachable();
 }
 
 /** @brief Adds widgets to @p layout if they belong on this @p side
diff --git a/src/libcalamares/partition/PartitionSize.cpp b/src/libcalamares/partition/PartitionSize.cpp
index 82444da6a..ddd3be2ef 100644
--- a/src/libcalamares/partition/PartitionSize.cpp
+++ b/src/libcalamares/partition/PartitionSize.cpp
@@ -139,6 +139,7 @@ PartitionSize::toBytes( qint64 totalSectors, qint64 sectorSize ) const
     case SizeUnit::GiB:
         return toBytes();
     }
+    __builtin_unreachable();
 }
 
 qint64
@@ -175,7 +176,7 @@ PartitionSize::toBytes( qint64 totalBytes ) const
     case SizeUnit::GiB:
         return toBytes();
     }
-
+    __builtin_unreachable();
 }
 
 qint64
@@ -206,6 +207,7 @@ PartitionSize::toBytes() const
     case SizeUnit::GiB:
         return CalamaresUtils::GiBtoBytes( static_cast< unsigned long long >( value() ) );
     }
+    __builtin_unreachable();
 }
 
 bool
@@ -231,6 +233,7 @@ PartitionSize::operator<( const PartitionSize& other ) const
     case SizeUnit::GiB:
         return ( toBytes() < other.toBytes() );
     }
+    __builtin_unreachable();
 }
 
 bool
@@ -256,6 +259,7 @@ PartitionSize::operator>( const PartitionSize& other ) const
     case SizeUnit::GiB:
         return ( toBytes() > other.toBytes() );
     }
+    __builtin_unreachable();
 }
 
 bool
@@ -281,6 +285,7 @@ PartitionSize::operator==( const PartitionSize& other ) const
     case SizeUnit::GiB:
         return ( toBytes() == other.toBytes() );
     }
+    __builtin_unreachable();
 }
 
 }  // namespace Partition
diff --git a/src/libcalamares/utils/Yaml.cpp b/src/libcalamares/utils/Yaml.cpp
index f999b8bb0..dd7523ae4 100644
--- a/src/libcalamares/utils/Yaml.cpp
+++ b/src/libcalamares/utils/Yaml.cpp
@@ -52,6 +52,7 @@ yamlToVariant( const YAML::Node& node )
     case YAML::NodeType::Undefined:
         return QVariant();
     }
+    __builtin_unreachable();
 }
 
 
diff --git a/src/modules/netinstall/Config.cpp b/src/modules/netinstall/Config.cpp
index 92cdcb2bf..e69b3c2a4 100644
--- a/src/modules/netinstall/Config.cpp
+++ b/src/modules/netinstall/Config.cpp
@@ -43,6 +43,7 @@ Config::status() const
     case Status::FailedNetworkError:
         return tr( "Network Installation. (Disabled: Unable to fetch package lists, check your network connection)" );
     }
+    __builtin_unreachable();
 }
 
 
diff --git a/src/modules/packagechooser/PackageChooserViewStep.cpp b/src/modules/packagechooser/PackageChooserViewStep.cpp
index b649e6431..d576f2753 100644
--- a/src/modules/packagechooser/PackageChooserViewStep.cpp
+++ b/src/modules/packagechooser/PackageChooserViewStep.cpp
@@ -110,6 +110,7 @@ PackageChooserViewStep::isNextEnabled() const
         // exactly one OR one or more
         return m_widget->hasSelection();
     }
+    __builtin_unreachable();
 }
 
 

From 83b06fe3cb9e2a3bcb24a5996c30a4fecc547f24 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 15:38:38 +0100
Subject: [PATCH 063/228] Changes: credits for this round

---
 CHANGES | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index ac8bf5855..1f6f104da 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,7 +10,9 @@ website will have to do for older versions.
 # 3.2.33 (unreleased) #
 
 This release contains contributions from (alphabetically by first name):
- - No external contributors yet
+ - Anke Boersma
+ - Andrius Štikonas
+ - Gaël PORTAY
 
 ## Core ##
  - Calamares now sets the C++ standard for compilation to C++17; this

From 8142d6f86cccc5119b25e0f737d23e5fff5188f6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 15:42:27 +0100
Subject: [PATCH 064/228] [keyboardq] Drop unnecessary variable -- just use the
 Config status

---
 src/modules/keyboardq/KeyboardQmlViewStep.cpp | 4 +---
 src/modules/keyboardq/KeyboardQmlViewStep.h   | 2 --
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
index 8e4663ee8..3e37b58ec 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
@@ -37,7 +37,7 @@ KeyboardQmlViewStep::prettyName() const
 QString
 KeyboardQmlViewStep::prettyStatus() const
 {
-    return m_prettyStatus;
+    return m_config->prettyStatus();
 }
 
 bool
@@ -80,7 +80,6 @@ void
 KeyboardQmlViewStep::onLeave()
 {
     m_config->finalize();
-    m_prettyStatus = m_config->prettyStatus();
 }
 
 QObject*
@@ -92,6 +91,5 @@ KeyboardQmlViewStep::getConfig()
 void
 KeyboardQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
-
     Calamares::QmlViewStep::setConfigurationMap( configurationMap );
 }
diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.h b/src/modules/keyboardq/KeyboardQmlViewStep.h
index 09390d8d9..c90c4a326 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.h
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.h
@@ -49,8 +49,6 @@ public:
 private:
     Config* m_config;
     bool m_nextEnabled;
-    QString m_prettyStatus;
-
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardQmlViewStepFactory )

From a940be2bb4233d7d2b99de99d8914dd4ffd3f2b3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 15:46:18 +0100
Subject: [PATCH 065/228] [keyboardq] Load configuration into Config object

---
 src/modules/keyboardq/KeyboardQmlViewStep.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
index 3e37b58ec..2eb9de0e7 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
@@ -91,5 +91,6 @@ KeyboardQmlViewStep::getConfig()
 void
 KeyboardQmlViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
+    m_config->setConfigurationMap( configurationMap );
     Calamares::QmlViewStep::setConfigurationMap( configurationMap );
 }

From 679f61395529f79fc6ee23bd039eb002d9b68afa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 15:48:51 +0100
Subject: [PATCH 066/228] [keyboard] Rename mysterious Config::init() to
 descriptive name

---
 src/modules/keyboard/Config.cpp               | 2 +-
 src/modules/keyboard/Config.h                 | 2 +-
 src/modules/keyboardq/KeyboardQmlViewStep.cpp | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 7f7eb7b27..efb345edf 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -127,7 +127,7 @@ findLayout( const KeyboardLayoutModel* klm, const QString& currentLayout )
 }
 
 void
-Config::init()
+Config::detectCurrentKeyboardLayout()
 {
     //### Detect current keyboard layout and variant
     QString currentLayout;
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index 9a3a3a013..7c18577f6 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -31,7 +31,7 @@ class Config : public QObject
 public:
     Config( QObject* parent = nullptr );
 
-    void init();
+    void detectCurrentKeyboardLayout();
 
     Calamares::JobList createJobs();
     QString prettyStatus() const;
diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
index 2eb9de0e7..62063b187 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
@@ -23,7 +23,7 @@ KeyboardQmlViewStep::KeyboardQmlViewStep( QObject* parent )
     , m_config( new Config( this ) )
     , m_nextEnabled( false )
 {
-    m_config->init();
+    m_config->detectCurrentKeyboardLayout();
     m_nextEnabled = true;
     emit nextStatusChanged( m_nextEnabled );
 }

From acb51902174a435bbc58ea45abb407e3533f3711 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 15:51:48 +0100
Subject: [PATCH 067/228] [keyboard] Use Config methods rather than own copy

- this continues the port of the keyboard module to use the Config
  object, which was horribly botched earlier.
---
 src/modules/keyboard/KeyboardPage.cpp     | 102 ----------------------
 src/modules/keyboard/KeyboardPage.h       |   2 -
 src/modules/keyboard/KeyboardViewStep.cpp |   2 +-
 3 files changed, 1 insertion(+), 105 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 07c5cf763..f97e3ac52 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -93,108 +93,6 @@ KeyboardPage::~KeyboardPage()
 }
 
 
-void
-KeyboardPage::init()
-{
-    //### Detect current keyboard layout and variant
-    QString currentLayout;
-    QString currentVariant;
-    QProcess process;
-    process.start( "setxkbmap", QStringList() << "-print" );
-
-    if ( process.waitForFinished() )
-    {
-        const QStringList list = QString( process.readAll() ).split( "\n", SplitSkipEmptyParts );
-
-        for ( QString line : list )
-        {
-            line = line.trimmed();
-            if ( !line.startsWith( "xkb_symbols" ) )
-            {
-                continue;
-            }
-
-            line = line.remove( "}" ).remove( "{" ).remove( ";" );
-            line = line.mid( line.indexOf( "\"" ) + 1 );
-
-            QStringList split = line.split( "+", SplitSkipEmptyParts );
-            if ( split.size() >= 2 )
-            {
-                currentLayout = split.at( 1 );
-
-                if ( currentLayout.contains( "(" ) )
-                {
-                    int parenthesisIndex = currentLayout.indexOf( "(" );
-                    currentVariant = currentLayout.mid( parenthesisIndex + 1 ).trimmed();
-                    currentVariant.chop( 1 );
-                    currentLayout = currentLayout.mid( 0, parenthesisIndex ).trimmed();
-                }
-
-                break;
-            }
-        }
-    }
-
-    //### Models
-    m_models = KeyboardGlobal::getKeyboardModels();
-    QMapIterator< QString, QString > mi( m_models );
-
-    ui->comboBoxModel->blockSignals( true );
-
-    while ( mi.hasNext() )
-    {
-        mi.next();
-
-        if ( mi.value() == "pc105" )
-        {
-            m_defaultIndex = ui->comboBoxModel->count();
-        }
-
-        ui->comboBoxModel->addItem( mi.key() );
-    }
-
-    ui->comboBoxModel->blockSignals( false );
-
-    // Set to default value pc105
-    ui->comboBoxModel->setCurrentIndex( m_defaultIndex );
-
-
-    //### Layouts and Variants
-
-    KeyboardLayoutModel* klm = new KeyboardLayoutModel( this );
-    ui->listLayout->setModel( klm );
-    connect( ui->listLayout->selectionModel(),
-             &QItemSelectionModel::currentChanged,
-             this,
-             &KeyboardPage::onListLayoutCurrentItemChanged );
-
-    // Block signals
-    ui->listLayout->blockSignals( true );
-
-    QPersistentModelIndex currentLayoutItem = findLayout( klm, currentLayout );
-    if ( !currentLayoutItem.isValid() && ( ( currentLayout == "latin" ) || ( currentLayout == "pc" ) ) )
-    {
-        currentLayout = "us";
-        currentLayoutItem = findLayout( klm, currentLayout );
-    }
-
-    // Set current layout and variant
-    if ( currentLayoutItem.isValid() )
-    {
-        ui->listLayout->setCurrentIndex( currentLayoutItem );
-        updateVariants( currentLayoutItem, currentVariant );
-    }
-
-    // Unblock signals
-    ui->listLayout->blockSignals( false );
-
-    // Default to the first available layout if none was set
-    // Do this after unblocking signals so we get the default variant handling.
-    if ( !currentLayoutItem.isValid() && klm->rowCount() > 0 )
-    {
-        ui->listLayout->setCurrentIndex( klm->index( 0 ) );
-    }
-}
 
 
 QString
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 4faeebd57..4e85ae8b7 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -36,8 +36,6 @@ public:
     explicit KeyboardPage( QWidget* parent = nullptr );
     ~KeyboardPage() override;
 
-    void init();
-
     QString prettyStatus() const;
 
     Calamares::JobList
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 03159268e..0ba20dd87 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -23,7 +23,7 @@ KeyboardViewStep::KeyboardViewStep( QObject* parent )
     , m_widget( new KeyboardPage() )
     , m_nextEnabled( false )
 {
-    m_widget->init();
+    m_config->detectCurrentKeyboardLayout();
     m_nextEnabled = true;
     emit nextStatusChanged( m_nextEnabled );
 }

From 14c079d1d6d8eab45a6476c43f740bf5aac72d59 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 15:53:59 +0100
Subject: [PATCH 068/228] [keyboard] Replace own copy of status by the one from
 Config

---
 src/modules/keyboard/KeyboardPage.cpp     | 17 -----------------
 src/modules/keyboard/KeyboardPage.h       |  2 --
 src/modules/keyboard/KeyboardViewStep.cpp |  3 +--
 src/modules/keyboard/KeyboardViewStep.h   |  1 -
 4 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index f97e3ac52..25cd7a366 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -92,23 +92,6 @@ KeyboardPage::~KeyboardPage()
     delete ui;
 }
 
-
-
-
-QString
-KeyboardPage::prettyStatus() const
-{
-    QString status;
-    status += tr( "Set keyboard model to %1.<br/>" ).arg( ui->comboBoxModel->currentText() );
-
-    QString layout = ui->listLayout->currentIndex().data().toString();
-    QString variant = ui->listVariant->currentItem() ? ui->listVariant->currentItem()->text() : QString( "<default>" );
-    status += tr( "Set keyboard layout to %1/%2." ).arg( layout, variant );
-
-    return status;
-}
-
-
 QList< Calamares::job_ptr >
 KeyboardPage::createJobs( const QString& xOrgConfFileName,
                           const QString& convertedKeymapPath,
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 4e85ae8b7..6c2f99b68 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -36,8 +36,6 @@ public:
     explicit KeyboardPage( QWidget* parent = nullptr );
     ~KeyboardPage() override;
 
-    QString prettyStatus() const;
-
     Calamares::JobList
     createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
 
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 0ba20dd87..5cb168dc5 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -48,7 +48,7 @@ KeyboardViewStep::prettyName() const
 QString
 KeyboardViewStep::prettyStatus() const
 {
-    return m_prettyStatus;
+    return m_config->prettyStatus();
 }
 
 
@@ -105,7 +105,6 @@ void
 KeyboardViewStep::onLeave()
 {
     m_widget->finalize();
-    m_prettyStatus = m_widget->prettyStatus();
 }
 
 
diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h
index 5cf2c6fd9..31769d192 100644
--- a/src/modules/keyboard/KeyboardViewStep.h
+++ b/src/modules/keyboard/KeyboardViewStep.h
@@ -50,7 +50,6 @@ private:
     Config* m_config;
     KeyboardPage* m_widget;
     bool m_nextEnabled;
-    QString m_prettyStatus;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardViewStepFactory )

From 35a2bd3f0fd1ba1a46f0c08ec21a1f23cd577d79 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 15:55:29 +0100
Subject: [PATCH 069/228] [keyboard] Use Config's own finalize()

---
 src/modules/keyboard/KeyboardPage.cpp     | 14 --------------
 src/modules/keyboard/KeyboardPage.h       |  1 -
 src/modules/keyboard/KeyboardViewStep.cpp |  2 +-
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 25cd7a366..7ca60be10 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -250,20 +250,6 @@ KeyboardPage::onActivate()
 }
 
 
-void
-KeyboardPage::finalize()
-{
-    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-    if ( !m_selectedLayout.isEmpty() )
-    {
-        gs->insert( "keyboardLayout", m_selectedLayout );
-        gs->insert( "keyboardVariant", m_selectedVariant );  //empty means default variant
-    }
-
-    //FIXME: also store keyboard model for something?
-}
-
-
 void
 KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant )
 {
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 6c2f99b68..41b4b7903 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -40,7 +40,6 @@ public:
     createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
 
     void onActivate();
-    void finalize();
 
 protected slots:
     void onListLayoutCurrentItemChanged( const QModelIndex& current, const QModelIndex& previous );
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 5cb168dc5..a068b5a5d 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -104,7 +104,7 @@ KeyboardViewStep::onActivate()
 void
 KeyboardViewStep::onLeave()
 {
-    m_widget->finalize();
+    m_config->finalize();
 }
 
 

From 0ffa500432a2dd5330e05d33c583336595c92ef6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 15:56:50 +0100
Subject: [PATCH 070/228] [keyboard] Remove unused code

- this has already migrated to Config but had not been removed locally
---
 src/modules/keyboard/KeyboardPage.cpp | 37 ---------------------------
 src/modules/keyboard/KeyboardPage.h   |  3 ---
 2 files changed, 40 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 7ca60be10..decf7714a 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -40,23 +40,6 @@ public:
 
 LayoutItem::~LayoutItem() {}
 
-static QPersistentModelIndex
-findLayout( const KeyboardLayoutModel* klm, const QString& currentLayout )
-{
-    QPersistentModelIndex currentLayoutItem;
-
-    for ( int i = 0; i < klm->rowCount(); ++i )
-    {
-        QModelIndex idx = klm->index( i );
-        if ( idx.isValid() && idx.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString() == currentLayout )
-        {
-            currentLayoutItem = idx;
-        }
-    }
-
-    return currentLayoutItem;
-}
-
 KeyboardPage::KeyboardPage( QWidget* parent )
     : QWidget( parent )
     , ui( new Ui::Page_Keyboard )
@@ -92,26 +75,6 @@ KeyboardPage::~KeyboardPage()
     delete ui;
 }
 
-QList< Calamares::job_ptr >
-KeyboardPage::createJobs( const QString& xOrgConfFileName,
-                          const QString& convertedKeymapPath,
-                          bool writeEtcDefaultKeyboard )
-{
-    QList< Calamares::job_ptr > list;
-    QString selectedModel = m_models.value( ui->comboBoxModel->currentText(), "pc105" );
-
-    Calamares::Job* j = new SetKeyboardLayoutJob( selectedModel,
-                                                  m_selectedLayout,
-                                                  m_selectedVariant,
-                                                  xOrgConfFileName,
-                                                  convertedKeymapPath,
-                                                  writeEtcDefaultKeyboard );
-    list.append( Calamares::job_ptr( j ) );
-
-    return list;
-}
-
-
 void
 KeyboardPage::guessLayout( const QStringList& langParts )
 {
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 41b4b7903..554832b5f 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -36,9 +36,6 @@ public:
     explicit KeyboardPage( QWidget* parent = nullptr );
     ~KeyboardPage() override;
 
-    Calamares::JobList
-    createJobs( const QString& xOrgConfFileName, const QString& convertedKeymapPath, bool writeEtcDefaultKeyboard );
-
     void onActivate();
 
 protected slots:

From 0947cd835486d238fbe8bb990c83b675f7621d50 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 16:12:36 +0100
Subject: [PATCH 071/228] [keyboard] Migrate to Config::onActivate() which is
 badly-named

---
 src/modules/keyboard/KeyboardPage.cpp     | 138 ----------------------
 src/modules/keyboard/KeyboardPage.h       |   4 -
 src/modules/keyboard/KeyboardViewStep.cpp |   2 +-
 3 files changed, 1 insertion(+), 143 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index decf7714a..bfa0b4b42 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -75,144 +75,6 @@ KeyboardPage::~KeyboardPage()
     delete ui;
 }
 
-void
-KeyboardPage::guessLayout( const QStringList& langParts )
-{
-    const KeyboardLayoutModel* klm = dynamic_cast< KeyboardLayoutModel* >( ui->listLayout->model() );
-    bool foundCountryPart = false;
-    for ( auto countryPart = langParts.rbegin(); !foundCountryPart && countryPart != langParts.rend(); ++countryPart )
-    {
-        cDebug() << Logger::SubEntry << "looking for locale part" << *countryPart;
-        for ( int i = 0; i < klm->rowCount(); ++i )
-        {
-            QModelIndex idx = klm->index( i );
-            QString name
-                = idx.isValid() ? idx.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString() : QString();
-            if ( idx.isValid() && ( name.compare( *countryPart, Qt::CaseInsensitive ) == 0 ) )
-            {
-                cDebug() << Logger::SubEntry << "matched" << name;
-                ui->listLayout->setCurrentIndex( idx );
-                foundCountryPart = true;
-                break;
-            }
-        }
-        if ( foundCountryPart )
-        {
-            ++countryPart;
-            if ( countryPart != langParts.rend() )
-            {
-                cDebug() << "Next level:" << *countryPart;
-                for ( int variantnumber = 0; variantnumber < ui->listVariant->count(); ++variantnumber )
-                {
-                    LayoutItem* variantdata = dynamic_cast< LayoutItem* >( ui->listVariant->item( variantnumber ) );
-                    if ( variantdata && ( variantdata->data.compare( *countryPart, Qt::CaseInsensitive ) == 0 ) )
-                    {
-                        ui->listVariant->setCurrentItem( variantdata );
-                        cDebug() << Logger::SubEntry << "matched variant" << variantdata->data << ' '
-                                 << variantdata->text();
-                    }
-                }
-            }
-        }
-    }
-}
-
-
-void
-KeyboardPage::onActivate()
-{
-    /* Guessing a keyboard layout based on the locale means
-     * mapping between language identifiers in <lang>_<country>
-     * format to keyboard mappings, which are <country>_<layout>
-     * format; in addition, some countries have multiple languages,
-     * so fr_BE and nl_BE want different layouts (both Belgian)
-     * and sometimes the language-country name doesn't match the
-     * keyboard-country name at all (e.g. Ellas vs. Greek).
-     *
-     * This is a table of language-to-keyboard mappings. The
-     * language identifier is the key, while the value is
-     * a string that is used instead of the real language
-     * identifier in guessing -- so it should be something
-     * like <layout>_<country>.
-     */
-    static constexpr char arabic[] = "ara";
-    static const auto specialCaseMap = QMap< std::string, std::string >( {
-        /* Most Arab countries map to Arabic keyboard (Default) */
-        { "ar_AE", arabic },
-        { "ar_BH", arabic },
-        { "ar_DZ", arabic },
-        { "ar_EG", arabic },
-        { "ar_IN", arabic },
-        { "ar_IQ", arabic },
-        { "ar_JO", arabic },
-        { "ar_KW", arabic },
-        { "ar_LB", arabic },
-        { "ar_LY", arabic },
-        /* Not Morocco: use layout ma */
-        { "ar_OM", arabic },
-        { "ar_QA", arabic },
-        { "ar_SA", arabic },
-        { "ar_SD", arabic },
-        { "ar_SS", arabic },
-        /* Not Syria: use layout sy */
-        { "ar_TN", arabic },
-        { "ar_YE", arabic },
-        { "ca_ES", "cat_ES" }, /* Catalan */
-        { "as_ES", "ast_ES" }, /* Asturian */
-        { "en_CA", "us" }, /* Canadian English */
-        { "el_CY", "gr" }, /* Greek in Cyprus */
-        { "el_GR", "gr" }, /* Greek in Greeze */
-        { "ig_NG", "igbo_NG" }, /* Igbo in Nigeria */
-        { "ha_NG", "hausa_NG" } /* Hausa */
-    } );
-
-    ui->listLayout->setFocus();
-
-    // Try to preselect a layout, depending on language and locale
-    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-    QString lang = gs->value( "localeConf" ).toMap().value( "LANG" ).toString();
-
-    cDebug() << "Got locale language" << lang;
-    if ( !lang.isEmpty() )
-    {
-        // Chop off .codeset and @modifier
-        int index = lang.indexOf( '.' );
-        if ( index >= 0 )
-        {
-            lang.truncate( index );
-        }
-        index = lang.indexOf( '@' );
-        if ( index >= 0 )
-        {
-            lang.truncate( index );
-        }
-
-        lang.replace( '-', '_' );  // Normalize separators
-    }
-    if ( !lang.isEmpty() )
-    {
-        std::string lang_s = lang.toStdString();
-        if ( specialCaseMap.contains( lang_s ) )
-        {
-            QString newLang = QString::fromStdString( specialCaseMap.value( lang_s ) );
-            cDebug() << Logger::SubEntry << "special case language" << lang << "becomes" << newLang;
-            lang = newLang;
-        }
-    }
-    if ( !lang.isEmpty() )
-    {
-        const auto langParts = lang.split( '_', SplitSkipEmptyParts );
-
-        // 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() << Logger::SubEntry << "extracted country" << country << "::" << langParts;
-
-        guessLayout( langParts );
-    }
-}
-
-
 void
 KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant )
 {
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 554832b5f..bb2ec17a9 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -36,15 +36,11 @@ public:
     explicit KeyboardPage( QWidget* parent = nullptr );
     ~KeyboardPage() override;
 
-    void onActivate();
-
 protected slots:
     void onListLayoutCurrentItemChanged( const QModelIndex& current, const QModelIndex& previous );
     void onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous );
 
 private:
-    /// Guess a layout based on the split-apart locale
-    void guessLayout( const QStringList& langParts );
     void updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant = QString() );
 
     Ui::Page_Keyboard* ui;
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index a068b5a5d..844c3c719 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -97,7 +97,7 @@ KeyboardViewStep::jobs() const
 void
 KeyboardViewStep::onActivate()
 {
-    m_widget->onActivate();
+    m_config->onActivate();
 }
 
 

From 734dbece8afe98645f5d916a686406f236860308 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 16:47:47 +0100
Subject: [PATCH 072/228] [keyboardq] Fix include style, remove unnecessary
 declarations

---
 src/modules/keyboardq/KeyboardQmlViewStep.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.h b/src/modules/keyboardq/KeyboardQmlViewStep.h
index c90c4a326..2b9f98e27 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.h
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.h
@@ -13,15 +13,12 @@
 
 #include "Config.h"
 
-#include <DllMacro.h>
-#include <utils/PluginFactory.h>
-#include <viewpages/QmlViewStep.h>
+#include "DllMacro.h"
+#include "utils/PluginFactory.h"
+#include "viewpages/QmlViewStep.h"
 
 #include <QObject>
 
-class Config;
-class KeyboardPage;
-
 class PLUGINDLLEXPORT KeyboardQmlViewStep : public Calamares::QmlViewStep
 {
     Q_OBJECT

From 8cf3bd23b9f5ff84c1b664ecf7e41e3df507d7da Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 16:55:02 +0100
Subject: [PATCH 073/228] [keyboardq] Remove superfluous variable (set to true,
 never changed)

---
 src/modules/keyboardq/KeyboardQmlViewStep.cpp | 6 ++----
 src/modules/keyboardq/KeyboardQmlViewStep.h   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.cpp b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
index 62063b187..e8ae630e7 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.cpp
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.cpp
@@ -21,11 +21,9 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardQmlViewStepFactory, registerPlugin<
 KeyboardQmlViewStep::KeyboardQmlViewStep( QObject* parent )
     : Calamares::QmlViewStep( parent )
     , m_config( new Config( this ) )
-    , m_nextEnabled( false )
 {
     m_config->detectCurrentKeyboardLayout();
-    m_nextEnabled = true;
-    emit nextStatusChanged( m_nextEnabled );
+    emit nextStatusChanged( true );
 }
 
 QString
@@ -43,7 +41,7 @@ KeyboardQmlViewStep::prettyStatus() const
 bool
 KeyboardQmlViewStep::isNextEnabled() const
 {
-    return m_nextEnabled;
+    return true;
 }
 
 bool
diff --git a/src/modules/keyboardq/KeyboardQmlViewStep.h b/src/modules/keyboardq/KeyboardQmlViewStep.h
index 2b9f98e27..eb31c3d59 100644
--- a/src/modules/keyboardq/KeyboardQmlViewStep.h
+++ b/src/modules/keyboardq/KeyboardQmlViewStep.h
@@ -45,7 +45,6 @@ public:
 
 private:
     Config* m_config;
-    bool m_nextEnabled;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardQmlViewStepFactory )

From 17b964701606bdbf620e7229840768568c6c6096 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Sun, 25 Oct 2020 05:14:42 +0300
Subject: [PATCH 074/228] [keyboard] Support for additional layout if current
 layout is not ASCII- capable in live system

---
 src/modules/keyboard/Config.cpp        | 132 ++++++++++++++++++++++++-
 src/modules/keyboard/Config.h          |  12 +++
 src/modules/keyboard/keyboard.qrc      |   1 +
 src/modules/keyboard/non-ascii-layouts |   4 +
 4 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 src/modules/keyboard/non-ascii-layouts

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 7f7eb7b27..4e59b5fda 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -49,6 +49,104 @@ xkbmap_layout_args( const QString& layout, const QString& variant )
     return r;
 }
 
+static inline QStringList
+xkbmap_layout_args( const QList<QPair<QString, QString>> layoutsAndVariantsList, const QString& switchOption = "grp:alt_shift_toggle")
+{
+    QStringList layouts;
+    QStringList variants;
+
+    for( auto& [layout,variant] : layoutsAndVariantsList )
+    {
+        layouts.append(layout);
+        variants.append(variant);
+    }
+
+    QStringList r{ "-layout", layouts.join( "," ) };
+
+    if ( !variants.isEmpty() )
+    {
+        r << "-variant" << variants.join( "," );
+    }
+
+    if ( !switchOption.isEmpty())
+    {
+        r << "-option" << switchOption;
+    }
+
+    return r;
+}
+
+static inline QString
+xkbmap_query_grp_option()
+{
+    QProcess setxkbmapQuery;
+    setxkbmapQuery.start( "setxkbmap", { "-query" } );
+    setxkbmapQuery.waitForFinished();
+
+    QString outputLine;
+
+    do
+    {
+        outputLine = setxkbmapQuery.readLine();
+    }
+    while( !setxkbmapQuery.atEnd() || !outputLine.startsWith("options:") );
+
+    if( !outputLine.startsWith("options:") )
+    {
+        return QString();
+    }
+
+    int index = outputLine.indexOf("grp:");
+
+    if( index == -1 )
+    {
+        return QString();
+    }
+
+    //it's either in the end of line or before the other option so \s or ,
+    int lastIndex = outputLine.indexOf( QRegExp("[\\s,]"), index );
+
+    return outputLine.mid( index, lastIndex-1 );
+}
+
+AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout, bool* found )
+{
+    QFile layoutTable(":/non-ascii-layouts");
+
+    if(!layoutTable.open(QIODevice::ReadOnly | QIODevice::Text)) {
+        cError() << "Non-ASCII layout table could not be opened";
+        *found = false;
+        return {};
+    }
+
+    QString tableLine;
+
+    do
+    {
+        tableLine = layoutTable.readLine();
+    }
+    while( !layoutTable.atEnd() || !tableLine.startsWith(layout) );
+
+    if( !tableLine.startsWith(layout) ){
+        *found = false;
+        return {};
+    }
+
+    *found = true;
+
+    QStringList tableEntries = tableLine.split(" ", SplitSkipEmptyParts);
+
+    AdditionalLayoutInfo r;
+
+    r.name = tableEntries[0];
+    r.additionalLayout = tableEntries[1];
+    r.additionalVariant = tableEntries[2];
+
+    r.vconsoleKeymap = tableEntries[3];
+
+    return r;
+}
+
 Config::Config( QObject* parent )
     : QObject( parent )
     , m_keyboardModelsModel( new KeyboardModelsModel( this ) )
@@ -82,8 +180,31 @@ Config::Config( QObject* parent )
         }
 
         connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
-            QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
-            cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
+            bool isNotAsciiCapable = false;
+            AdditionalLayoutInfo info = getAdditionalLayoutInfo( m_selectedLayout, &isNotAsciiCapable );
+
+            if(isNotAsciiCapable)
+            {
+                m_selectedLayoutsAdditionalLayoutInfo = info;
+                QString switchOption = xkbmap_query_grp_option();
+
+                QProcess::execute( "setxkbmap", xkbmap_layout_args( {
+                                                                        {m_selectedLayout, m_selectedVariant},
+                                                                        {info.additionalLayout, info.additionalVariant}
+                                                                    },
+                                                                    switchOption.isEmpty()?"grp:alt_shift_toggle":QString() )
+                                   );
+                cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant
+                         << "(added " << info.additionalLayout << "-" << info.additionalVariant << " since target layout is not ASCII-capable)";
+
+
+            }
+            else
+            {
+                m_selectedLayoutsAdditionalLayoutInfo = AdditionalLayoutInfo();
+                QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
+                cDebug() << "xkbеmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
+            }
             m_setxkbmapTimer.disconnect( this );
         } );
         m_setxkbmapTimer.start( QApplication::keyboardInputInterval() );
@@ -372,6 +493,13 @@ Config::finalize()
     {
         gs->insert( "keyboardLayout", m_selectedLayout );
         gs->insert( "keyboardVariant", m_selectedVariant );  //empty means default variant
+
+        if ( !m_selectedLayoutsAdditionalLayoutInfo.name.isEmpty() )
+        {
+            gs->insert( "keyboardAdditionalLayout", m_selectedLayoutsAdditionalLayoutInfo.additionalLayout);
+            gs->insert( "keyboardAdditionalLayout", m_selectedLayoutsAdditionalLayoutInfo.additionalVariant);
+            gs->insert( "keyboardVConsoleKeymap", m_selectedLayoutsAdditionalLayoutInfo.vconsoleKeymap );
+        }
     }
 
     //FIXME: also store keyboard model for something?
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index 9a3a3a013..34d719d1b 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -20,6 +20,15 @@
 #include <QTimer>
 #include <QUrl>
 
+struct AdditionalLayoutInfo {
+    QString name;
+
+    QString additionalLayout;
+    QString additionalVariant;
+
+    QString vconsoleKeymap;
+};
+
 class Config : public QObject
 {
     Q_OBJECT
@@ -41,6 +50,8 @@ public:
 
     void setConfigurationMap( const QVariantMap& configurationMap );
 
+    static AdditionalLayoutInfo getAdditionalLayoutInfo( const QString& layout, bool* found );
+
 private:
     void guessLayout( const QStringList& langParts );
     void updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant = QString() );
@@ -52,6 +63,7 @@ private:
     QString m_selectedLayout;
     QString m_selectedModel;
     QString m_selectedVariant;
+    AdditionalLayoutInfo m_selectedLayoutsAdditionalLayoutInfo;
     QTimer m_setxkbmapTimer;
 
     // From configuration
diff --git a/src/modules/keyboard/keyboard.qrc b/src/modules/keyboard/keyboard.qrc
index dd211e630..4283d8190 100644
--- a/src/modules/keyboard/keyboard.qrc
+++ b/src/modules/keyboard/keyboard.qrc
@@ -2,5 +2,6 @@
     <qresource prefix="/">
         <file>kbd-model-map</file>
         <file>images/restore.png</file>
+        <file>non-ascii-layouts</file>
     </qresource>
 </RCC>
diff --git a/src/modules/keyboard/non-ascii-layouts b/src/modules/keyboard/non-ascii-layouts
new file mode 100644
index 000000000..83935c190
--- /dev/null
+++ b/src/modules/keyboard/non-ascii-layouts
@@ -0,0 +1,4 @@
+# Layouts stored here need additional layout (usually us) to provide ASCII support for user
+
+#layout   additional-layout   additional-variant   vconsole-keymap
+ru        us                  -                    ruwin_alt_sh-UTF-8

From 09b5e42734c040312ca1021067048a392d7421bd Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Sun, 25 Oct 2020 14:29:33 +0300
Subject: [PATCH 075/228] [keyboard] Minor additional layout info rework

---
 src/modules/keyboard/Config.cpp | 34 ++++++++++++++-------------------
 src/modules/keyboard/Config.h   |  4 +---
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 4e59b5fda..47aaf6dbe 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -109,14 +109,13 @@ xkbmap_query_grp_option()
     return outputLine.mid( index, lastIndex-1 );
 }
 
-AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout, bool* found )
+AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout )
 {
-    QFile layoutTable(":/non-ascii-layouts");
+    QFile layoutTable( ":/non-ascii-layouts" );
 
-    if(!layoutTable.open(QIODevice::ReadOnly | QIODevice::Text)) {
+    if( !layoutTable.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
         cError() << "Non-ASCII layout table could not be opened";
-        *found = false;
-        return {};
+        return AdditionalLayoutInfo();
     }
 
     QString tableLine;
@@ -125,22 +124,19 @@ AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout, boo
     {
         tableLine = layoutTable.readLine();
     }
-    while( !layoutTable.atEnd() || !tableLine.startsWith(layout) );
+    while( !layoutTable.atEnd() || !tableLine.startsWith( layout ) );
 
-    if( !tableLine.startsWith(layout) ){
-        *found = false;
-        return {};
+    if( !tableLine.startsWith( layout ) )
+    {
+        return AdditionalLayoutInfo();
     }
 
-    *found = true;
-
-    QStringList tableEntries = tableLine.split(" ", SplitSkipEmptyParts);
+    QStringList tableEntries = tableLine.split( " ", SplitSkipEmptyParts );
 
     AdditionalLayoutInfo r;
 
-    r.name = tableEntries[0];
     r.additionalLayout = tableEntries[1];
-    r.additionalVariant = tableEntries[2];
+    r.additionalVariant = tableEntries[2] == "-" ? "" : tableEntries[2];
 
     r.vconsoleKeymap = tableEntries[3];
 
@@ -180,10 +176,9 @@ Config::Config( QObject* parent )
         }
 
         connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
-            bool isNotAsciiCapable = false;
-            AdditionalLayoutInfo info = getAdditionalLayoutInfo( m_selectedLayout, &isNotAsciiCapable );
+            AdditionalLayoutInfo info = getAdditionalLayoutInfo( m_selectedLayout);
 
-            if(isNotAsciiCapable)
+            if(!info.additionalLayout.isEmpty())
             {
                 m_selectedLayoutsAdditionalLayoutInfo = info;
                 QString switchOption = xkbmap_query_grp_option();
@@ -195,8 +190,7 @@ Config::Config( QObject* parent )
                                                                     switchOption.isEmpty()?"grp:alt_shift_toggle":QString() )
                                    );
                 cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant
-                         << "(added " << info.additionalLayout << "-" << info.additionalVariant << " since target layout is not ASCII-capable)";
-
+                         << "(added " << info.additionalLayout << "-" << info.additionalVariant << " since current layout is not ASCII-capable)";
 
             }
             else
@@ -494,7 +488,7 @@ Config::finalize()
         gs->insert( "keyboardLayout", m_selectedLayout );
         gs->insert( "keyboardVariant", m_selectedVariant );  //empty means default variant
 
-        if ( !m_selectedLayoutsAdditionalLayoutInfo.name.isEmpty() )
+        if ( !m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty() )
         {
             gs->insert( "keyboardAdditionalLayout", m_selectedLayoutsAdditionalLayoutInfo.additionalLayout);
             gs->insert( "keyboardAdditionalLayout", m_selectedLayoutsAdditionalLayoutInfo.additionalVariant);
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index 34d719d1b..96b3d7dd4 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -21,8 +21,6 @@
 #include <QUrl>
 
 struct AdditionalLayoutInfo {
-    QString name;
-
     QString additionalLayout;
     QString additionalVariant;
 
@@ -50,7 +48,7 @@ public:
 
     void setConfigurationMap( const QVariantMap& configurationMap );
 
-    static AdditionalLayoutInfo getAdditionalLayoutInfo( const QString& layout, bool* found );
+    static AdditionalLayoutInfo getAdditionalLayoutInfo( const QString& layout );
 
 private:
     void guessLayout( const QStringList& langParts );

From 354dc1613a7eae1ec36ecc6ac157f9fc9d028a9e Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Mon, 26 Oct 2020 18:22:43 +0300
Subject: [PATCH 076/228] [keyboard] Removed unnecessary repacking in
 xkbmap_layout_args

---
 src/modules/keyboard/Config.cpp | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 47aaf6dbe..4d61b0938 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -50,15 +50,12 @@ xkbmap_layout_args( const QString& layout, const QString& variant )
 }
 
 static inline QStringList
-xkbmap_layout_args( const QList<QPair<QString, QString>> layoutsAndVariantsList, const QString& switchOption = "grp:alt_shift_toggle")
+xkbmap_layout_args( const QStringList& layouts, const QStringList& variants, const QString& switchOption = "grp:alt_shift_toggle")
 {
-    QStringList layouts;
-    QStringList variants;
-
-    for( auto& [layout,variant] : layoutsAndVariantsList )
+    if ( layouts.size() != variants.size() )
     {
-        layouts.append(layout);
-        variants.append(variant);
+        cError() << "Number of layouts and variants must be equal (empty string should be used if there is no corresponding variant)";
+        return QStringList();
     }
 
     QStringList r{ "-layout", layouts.join( "," ) };
@@ -183,11 +180,10 @@ Config::Config( QObject* parent )
                 m_selectedLayoutsAdditionalLayoutInfo = info;
                 QString switchOption = xkbmap_query_grp_option();
 
-                QProcess::execute( "setxkbmap", xkbmap_layout_args( {
-                                                                        {m_selectedLayout, m_selectedVariant},
-                                                                        {info.additionalLayout, info.additionalVariant}
-                                                                    },
-                                                                    switchOption.isEmpty()?"grp:alt_shift_toggle":QString() )
+                QProcess::execute( "setxkbmap", xkbmap_layout_args(
+                                       { m_selectedLayout, info.additionalLayout },
+                                       { m_selectedVariant, info.additionalVariant },
+                                       switchOption.isEmpty()?"grp:alt_shift_toggle":QString() )
                                    );
                 cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant
                          << "(added " << info.additionalLayout << "-" << info.additionalVariant << " since current layout is not ASCII-capable)";

From 384b1ba8c69c9f032f459815761f70d8ecd9fada Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Mon, 26 Oct 2020 18:26:14 +0300
Subject: [PATCH 077/228] [keyboard] Swapped primary and additional layouts in
 selection

---
 src/modules/keyboard/Config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 4d61b0938..173f34051 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -181,8 +181,8 @@ Config::Config( QObject* parent )
                 QString switchOption = xkbmap_query_grp_option();
 
                 QProcess::execute( "setxkbmap", xkbmap_layout_args(
-                                       { m_selectedLayout, info.additionalLayout },
-                                       { m_selectedVariant, info.additionalVariant },
+                                       { info.additionalLayout, m_selectedLayout },
+                                       { info.additionalVariant, m_selectedVariant },
                                        switchOption.isEmpty()?"grp:alt_shift_toggle":QString() )
                                    );
                 cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant

From 19b1fb3358f6ca4e8f969757b140c7dc266f32f5 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Mon, 26 Oct 2020 18:30:24 +0300
Subject: [PATCH 078/228] [keyboard] Added explanatory comment for
 xkbmap_query_grp_option

---
 src/modules/keyboard/Config.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 173f34051..e766c8a53 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -73,6 +73,9 @@ xkbmap_layout_args( const QStringList& layouts, const QStringList& variants, con
     return r;
 }
 
+/* Returns group-switch setxkbd option if set
+ * or an empty string otherwise
+ */
 static inline QString
 xkbmap_query_grp_option()
 {

From 0dd027af90caf23bbafcac5207247047079e4c32 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 27 Oct 2020 04:53:05 +0300
Subject: [PATCH 079/228] [keyboard] Fixed condition bug

---
 src/modules/keyboard/Config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index e766c8a53..aab7db014 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -89,7 +89,7 @@ xkbmap_query_grp_option()
     {
         outputLine = setxkbmapQuery.readLine();
     }
-    while( !setxkbmapQuery.atEnd() || !outputLine.startsWith("options:") );
+    while( setxkbmapQuery.canReadLine() && !outputLine.startsWith("options:") );
 
     if( !outputLine.startsWith("options:") )
     {
@@ -124,7 +124,7 @@ AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout )
     {
         tableLine = layoutTable.readLine();
     }
-    while( !layoutTable.atEnd() || !tableLine.startsWith( layout ) );
+    while( layoutTable.canReadLine() && !tableLine.startsWith( layout ) );
 
     if( !tableLine.startsWith( layout ) )
     {

From bfc60ad2cfc2f16ca87fd3c024a2d96defa0c023 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 27 Oct 2020 04:56:19 +0300
Subject: [PATCH 080/228] [keyboard] Implemented X11 config writing for
 additional layout

---
 src/modules/keyboard/AdditionalLayoutInfo.h   | 24 +++++++++++++
 src/modules/keyboard/Config.cpp               | 25 ++++++++-----
 src/modules/keyboard/Config.h                 |  8 +----
 src/modules/keyboard/KeyboardPage.cpp         |  1 +
 src/modules/keyboard/SetKeyboardLayoutJob.cpp | 36 +++++++++++++------
 src/modules/keyboard/SetKeyboardLayoutJob.h   |  4 +++
 src/modules/keyboardq/keyboardq.qrc           |  1 +
 7 files changed, 72 insertions(+), 27 deletions(-)
 create mode 100644 src/modules/keyboard/AdditionalLayoutInfo.h

diff --git a/src/modules/keyboard/AdditionalLayoutInfo.h b/src/modules/keyboard/AdditionalLayoutInfo.h
new file mode 100644
index 000000000..660449952
--- /dev/null
+++ b/src/modules/keyboard/AdditionalLayoutInfo.h
@@ -0,0 +1,24 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2020 Artem Grinev <agrinev@manjaro.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+#ifndef KEYBOARD_ADDITIONAL_LAYOUT_INFO_H
+#define KEYBOARD_ADDITIONAL_LAYOUT_INFO_H
+
+#include <QString>
+
+struct AdditionalLayoutInfo {
+    QString additionalLayout;
+    QString additionalVariant;
+
+    QString groupSwitcher;
+
+    QString vconsoleKeymap;
+};
+
+#endif
diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index aab7db014..03a774ef6 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -176,27 +176,33 @@ Config::Config( QObject* parent )
         }
 
         connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
-            AdditionalLayoutInfo info = getAdditionalLayoutInfo( m_selectedLayout);
+            m_selectedLayoutsAdditionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
 
-            if(!info.additionalLayout.isEmpty())
+            if(!m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty())
             {
-                m_selectedLayoutsAdditionalLayoutInfo = info;
-                QString switchOption = xkbmap_query_grp_option();
+                m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
 
                 QProcess::execute( "setxkbmap", xkbmap_layout_args(
-                                       { info.additionalLayout, m_selectedLayout },
-                                       { info.additionalVariant, m_selectedVariant },
-                                       switchOption.isEmpty()?"grp:alt_shift_toggle":QString() )
+                                       { m_selectedLayoutsAdditionalLayoutInfo.additionalLayout, m_selectedLayout },
+                                       { m_selectedLayoutsAdditionalLayoutInfo.additionalVariant, m_selectedVariant },
+                                       m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty()?"grp:alt_shift_toggle":QString() )
                                    );
+
+                if( m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty() )
+                {
+                    m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle";
+                }
+
                 cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant
-                         << "(added " << info.additionalLayout << "-" << info.additionalVariant << " since current layout is not ASCII-capable)";
+                         << "(added " << m_selectedLayoutsAdditionalLayoutInfo.additionalLayout << "-"
+                         << m_selectedLayoutsAdditionalLayoutInfo.additionalVariant << " since current layout is not ASCII-capable)";
 
             }
             else
             {
                 m_selectedLayoutsAdditionalLayoutInfo = AdditionalLayoutInfo();
                 QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
-                cDebug() << "xkbеmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
+                cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
             }
             m_setxkbmapTimer.disconnect( this );
         } );
@@ -336,6 +342,7 @@ Config::createJobs()
     Calamares::Job* j = new SetKeyboardLayoutJob( m_selectedModel,
                                                   m_selectedLayout,
                                                   m_selectedVariant,
+                                                  m_selectedLayoutsAdditionalLayoutInfo,
                                                   m_xOrgConfFileName,
                                                   m_convertedKeymapPath,
                                                   m_writeEtcDefaultKeyboard );
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index 96b3d7dd4..dda4403b3 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -13,6 +13,7 @@
 
 #include "Job.h"
 #include "KeyboardLayoutModel.h"
+#include "AdditionalLayoutInfo.h"
 
 #include <QAbstractListModel>
 #include <QMap>
@@ -20,13 +21,6 @@
 #include <QTimer>
 #include <QUrl>
 
-struct AdditionalLayoutInfo {
-    QString additionalLayout;
-    QString additionalVariant;
-
-    QString vconsoleKeymap;
-};
-
 class Config : public QObject
 {
     Q_OBJECT
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 07c5cf763..84958761b 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -222,6 +222,7 @@ KeyboardPage::createJobs( const QString& xOrgConfFileName,
     Calamares::Job* j = new SetKeyboardLayoutJob( selectedModel,
                                                   m_selectedLayout,
                                                   m_selectedVariant,
+                                                  AdditionalLayoutInfo(),
                                                   xOrgConfFileName,
                                                   convertedKeymapPath,
                                                   writeEtcDefaultKeyboard );
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index cabe0b5c0..ddadc8430 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -30,9 +30,9 @@
 #include <QTextStream>
 
 
-SetKeyboardLayoutJob::SetKeyboardLayoutJob( const QString& model,
+SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model,
                                             const QString& layout,
-                                            const QString& variant,
+                                            const QString& variant, const AdditionalLayoutInfo &additionaLayoutInfo,
                                             const QString& xOrgConfFileName,
                                             const QString& convertedKeymapPath,
                                             bool writeEtcDefaultKeyboard )
@@ -40,6 +40,7 @@ SetKeyboardLayoutJob::SetKeyboardLayoutJob( const QString& model,
     , m_model( model )
     , m_layout( layout )
     , m_variant( variant )
+    , m_additionalLayoutInfo( additionaLayoutInfo )
     , m_xOrgConfFileName( xOrgConfFileName )
     , m_convertedKeymapPath( convertedKeymapPath )
     , m_writeEtcDefaultKeyboard( writeEtcDefaultKeyboard )
@@ -250,19 +251,32 @@ SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const
               "        Identifier \"system-keyboard\"\n"
               "        MatchIsKeyboard \"on\"\n";
 
-    if ( !m_layout.isEmpty() )
-    {
-        stream << "        Option \"XkbLayout\" \"" << m_layout << "\"\n";
-    }
 
-    if ( !m_model.isEmpty() )
+    if ( m_additionalLayoutInfo.additionalLayout.isEmpty() )
     {
-        stream << "        Option \"XkbModel\" \"" << m_model << "\"\n";
-    }
+        if ( !m_layout.isEmpty() )
+        {
+            stream << "        Option \"XkbLayout\" \"" << m_layout << "\"\n";
+        }
 
-    if ( !m_variant.isEmpty() )
+        if ( !m_variant.isEmpty() )
+        {
+            stream << "        Option \"XkbVariant\" \"" << m_variant << "\"\n";
+        }
+    }
+    else
     {
-        stream << "        Option \"XkbVariant\" \"" << m_variant << "\"\n";
+        if ( !m_layout.isEmpty() )
+        {
+            stream << "        Option \"XkbLayout\" \"" << m_additionalLayoutInfo.additionalLayout << "," << m_layout << "\"\n";
+        }
+
+        if ( !m_variant.isEmpty() )
+        {
+            stream << "        Option \"XkbVariant\" \"" << m_additionalLayoutInfo.additionalVariant << "," << m_variant << "\"\n";
+        }
+
+        stream << "        Option \"XkbOptions\" \"" << m_additionalLayoutInfo.groupSwitcher << "\"\n";
     }
 
     stream << "EndSection\n";
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.h b/src/modules/keyboard/SetKeyboardLayoutJob.h
index f1eabe195..b1ce0bb15 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.h
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.h
@@ -12,6 +12,8 @@
 #define SETKEYBOARDLAYOUTJOB_H
 
 #include "Job.h"
+#include "AdditionalLayoutInfo.h"
+
 
 
 class SetKeyboardLayoutJob : public Calamares::Job
@@ -21,6 +23,7 @@ public:
     SetKeyboardLayoutJob( const QString& model,
                           const QString& layout,
                           const QString& variant,
+                          const AdditionalLayoutInfo& additionaLayoutInfo,
                           const QString& xOrgConfFileName,
                           const QString& convertedKeymapPath,
                           bool writeEtcDefaultKeyboard );
@@ -38,6 +41,7 @@ private:
     QString m_model;
     QString m_layout;
     QString m_variant;
+    AdditionalLayoutInfo m_additionalLayoutInfo;
     QString m_xOrgConfFileName;
     QString m_convertedKeymapPath;
     const bool m_writeEtcDefaultKeyboard;
diff --git a/src/modules/keyboardq/keyboardq.qrc b/src/modules/keyboardq/keyboardq.qrc
index 492f6e213..d2473a8ec 100644
--- a/src/modules/keyboardq/keyboardq.qrc
+++ b/src/modules/keyboardq/keyboardq.qrc
@@ -3,5 +3,6 @@
         <file alias="kbd-model-map">../keyboard/kbd-model-map</file>
         <file alias="images/restore.png">../keyboard/images/restore.png</file>
         <file>keyboardq.qml</file>
+        <file alias="non-ascii-layouts">../keyboard/non-ascii-layouts</file>
     </qresource>
 </RCC>

From 4a3273d6341e8f1fcc81eea937d0b45d9df5cc67 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 27 Oct 2020 16:59:22 +0100
Subject: [PATCH 081/228] [keyboard] Remove superfluous variable (set to true,
 never changed)

---
 src/modules/keyboard/KeyboardViewStep.cpp | 6 ++----
 src/modules/keyboard/KeyboardViewStep.h   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 844c3c719..80945f848 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -21,11 +21,9 @@ KeyboardViewStep::KeyboardViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_config( new Config(this) )
     , m_widget( new KeyboardPage() )
-    , m_nextEnabled( false )
 {
     m_config->detectCurrentKeyboardLayout();
-    m_nextEnabled = true;
-    emit nextStatusChanged( m_nextEnabled );
+    emit nextStatusChanged( true );
 }
 
 
@@ -62,7 +60,7 @@ KeyboardViewStep::widget()
 bool
 KeyboardViewStep::isNextEnabled() const
 {
-    return m_nextEnabled;
+    return true;
 }
 
 
diff --git a/src/modules/keyboard/KeyboardViewStep.h b/src/modules/keyboard/KeyboardViewStep.h
index 31769d192..902b888fd 100644
--- a/src/modules/keyboard/KeyboardViewStep.h
+++ b/src/modules/keyboard/KeyboardViewStep.h
@@ -49,7 +49,6 @@ public:
 private:
     Config* m_config;
     KeyboardPage* m_widget;
-    bool m_nextEnabled;
 };
 
 CALAMARES_PLUGIN_FACTORY_DECLARATION( KeyboardViewStepFactory )

From 996c82160eb276697de24e54c018e3a7803f632b Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 27 Oct 2020 20:38:04 +0300
Subject: [PATCH 082/228] [keyboard] fixed typo

---
 src/modules/keyboard/SetKeyboardLayoutJob.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index ddadc8430..e733c18ed 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -32,7 +32,8 @@
 
 SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model,
                                             const QString& layout,
-                                            const QString& variant, const AdditionalLayoutInfo &additionaLayoutInfo,
+                                            const QString& variant,
+                                            const AdditionalLayoutInfo &additionalLayoutInfo,
                                             const QString& xOrgConfFileName,
                                             const QString& convertedKeymapPath,
                                             bool writeEtcDefaultKeyboard )
@@ -40,7 +41,7 @@ SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model,
     , m_model( model )
     , m_layout( layout )
     , m_variant( variant )
-    , m_additionalLayoutInfo( additionaLayoutInfo )
+    , m_additionalLayoutInfo( additionalLayoutInfo )
     , m_xOrgConfFileName( xOrgConfFileName )
     , m_convertedKeymapPath( convertedKeymapPath )
     , m_writeEtcDefaultKeyboard( writeEtcDefaultKeyboard )

From 6667ea834feba460b2adceabc435dc09e55644d3 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 27 Oct 2020 20:42:49 +0300
Subject: [PATCH 083/228] [keyboard] Adjusted indents

---
 src/modules/keyboard/Config.cpp               | 10 +++++-----
 src/modules/keyboard/SetKeyboardLayoutJob.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 03a774ef6..1e46e7f6d 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -91,12 +91,12 @@ xkbmap_query_grp_option()
     }
     while( setxkbmapQuery.canReadLine() && !outputLine.startsWith("options:") );
 
-    if( !outputLine.startsWith("options:") )
+    if( !outputLine.startsWith( "options:" ) )
     {
         return QString();
     }
 
-    int index = outputLine.indexOf("grp:");
+    int index = outputLine.indexOf( "grp:" );
 
     if( index == -1 )
     {
@@ -104,7 +104,7 @@ xkbmap_query_grp_option()
     }
 
     //it's either in the end of line or before the other option so \s or ,
-    int lastIndex = outputLine.indexOf( QRegExp("[\\s,]"), index );
+    int lastIndex = outputLine.indexOf( QRegExp( "[\\s,]" ), index );
 
     return outputLine.mid( index, lastIndex-1 );
 }
@@ -178,14 +178,14 @@ Config::Config( QObject* parent )
         connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
             m_selectedLayoutsAdditionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
 
-            if(!m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty())
+            if( !m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty() )
             {
                 m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
 
                 QProcess::execute( "setxkbmap", xkbmap_layout_args(
                                        { m_selectedLayoutsAdditionalLayoutInfo.additionalLayout, m_selectedLayout },
                                        { m_selectedLayoutsAdditionalLayoutInfo.additionalVariant, m_selectedVariant },
-                                       m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty()?"grp:alt_shift_toggle":QString() )
+                                       m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty() ? "grp:alt_shift_toggle" : QString() )
                                    );
 
                 if( m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty() )
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index e733c18ed..766044179 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -33,7 +33,7 @@
 SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model,
                                             const QString& layout,
                                             const QString& variant,
-                                            const AdditionalLayoutInfo &additionalLayoutInfo,
+                                            const AdditionalLayoutInfo& additionalLayoutInfo,
                                             const QString& xOrgConfFileName,
                                             const QString& convertedKeymapPath,
                                             bool writeEtcDefaultKeyboard )

From 3552233bf12a63225ee5793520bdfb03090845ff Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 27 Oct 2020 20:48:18 +0300
Subject: [PATCH 084/228] [keyboard] Minor logic rework

---
 src/modules/keyboard/Config.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 1e46e7f6d..4725dc91d 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -178,21 +178,23 @@ Config::Config( QObject* parent )
         connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
             m_selectedLayoutsAdditionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
 
-            if( !m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty() )
+            if ( !m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty() )
             {
                 m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
 
-                QProcess::execute( "setxkbmap", xkbmap_layout_args(
-                                       { m_selectedLayoutsAdditionalLayoutInfo.additionalLayout, m_selectedLayout },
-                                       { m_selectedLayoutsAdditionalLayoutInfo.additionalVariant, m_selectedVariant },
-                                       m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty() ? "grp:alt_shift_toggle" : QString() )
-                                   );
-
                 if( m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty() )
                 {
                     m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle";
                 }
 
+                QProcess::execute( "setxkbmap", xkbmap_layout_args(
+                                       { m_selectedLayoutsAdditionalLayoutInfo.additionalLayout, m_selectedLayout },
+                                       { m_selectedLayoutsAdditionalLayoutInfo.additionalVariant, m_selectedVariant },
+                                       m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher )
+                                   );
+
+
+
                 cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant
                          << "(added " << m_selectedLayoutsAdditionalLayoutInfo.additionalLayout << "-"
                          << m_selectedLayoutsAdditionalLayoutInfo.additionalVariant << " since current layout is not ASCII-capable)";
@@ -200,7 +202,6 @@ Config::Config( QObject* parent )
             }
             else
             {
-                m_selectedLayoutsAdditionalLayoutInfo = AdditionalLayoutInfo();
                 QProcess::execute( "setxkbmap", xkbmap_layout_args( m_selectedLayout, m_selectedVariant ) );
                 cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant;
             }

From 4434e85d4d8871d7e1d0cea703e894b7539a94cb Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 27 Oct 2020 20:53:20 +0300
Subject: [PATCH 085/228] [keyboard] Simplified variable name

---
 src/modules/keyboard/Config.cpp | 30 +++++++++++++++---------------
 src/modules/keyboard/Config.h   |  5 ++++-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 4725dc91d..b3365cff6 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -176,28 +176,28 @@ Config::Config( QObject* parent )
         }
 
         connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
-            m_selectedLayoutsAdditionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
+            m_additionalLayoutInfo = getAdditionalLayoutInfo( m_selectedLayout );
 
-            if ( !m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty() )
+            if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() )
             {
-                m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
+                m_additionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
 
-                if( m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher.isEmpty() )
+                if( m_additionalLayoutInfo.groupSwitcher.isEmpty() )
                 {
-                    m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle";
+                    m_additionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle";
                 }
 
                 QProcess::execute( "setxkbmap", xkbmap_layout_args(
-                                       { m_selectedLayoutsAdditionalLayoutInfo.additionalLayout, m_selectedLayout },
-                                       { m_selectedLayoutsAdditionalLayoutInfo.additionalVariant, m_selectedVariant },
-                                       m_selectedLayoutsAdditionalLayoutInfo.groupSwitcher )
+                                       { m_additionalLayoutInfo.additionalLayout, m_selectedLayout },
+                                       { m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
+                                       m_additionalLayoutInfo.groupSwitcher )
                                    );
 
 
 
                 cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant
-                         << "(added " << m_selectedLayoutsAdditionalLayoutInfo.additionalLayout << "-"
-                         << m_selectedLayoutsAdditionalLayoutInfo.additionalVariant << " since current layout is not ASCII-capable)";
+                         << "(added " << m_additionalLayoutInfo.additionalLayout << "-"
+                         << m_additionalLayoutInfo.additionalVariant << " since current layout is not ASCII-capable)";
 
             }
             else
@@ -343,7 +343,7 @@ Config::createJobs()
     Calamares::Job* j = new SetKeyboardLayoutJob( m_selectedModel,
                                                   m_selectedLayout,
                                                   m_selectedVariant,
-                                                  m_selectedLayoutsAdditionalLayoutInfo,
+                                                  m_additionalLayoutInfo,
                                                   m_xOrgConfFileName,
                                                   m_convertedKeymapPath,
                                                   m_writeEtcDefaultKeyboard );
@@ -495,11 +495,11 @@ Config::finalize()
         gs->insert( "keyboardLayout", m_selectedLayout );
         gs->insert( "keyboardVariant", m_selectedVariant );  //empty means default variant
 
-        if ( !m_selectedLayoutsAdditionalLayoutInfo.additionalLayout.isEmpty() )
+        if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() )
         {
-            gs->insert( "keyboardAdditionalLayout", m_selectedLayoutsAdditionalLayoutInfo.additionalLayout);
-            gs->insert( "keyboardAdditionalLayout", m_selectedLayoutsAdditionalLayoutInfo.additionalVariant);
-            gs->insert( "keyboardVConsoleKeymap", m_selectedLayoutsAdditionalLayoutInfo.vconsoleKeymap );
+            gs->insert( "keyboardAdditionalLayout", m_additionalLayoutInfo.additionalLayout);
+            gs->insert( "keyboardAdditionalLayout", m_additionalLayoutInfo.additionalVariant);
+            gs->insert( "keyboardVConsoleKeymap", m_additionalLayoutInfo.vconsoleKeymap );
         }
     }
 
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index dda4403b3..031cf8922 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -55,7 +55,10 @@ private:
     QString m_selectedLayout;
     QString m_selectedModel;
     QString m_selectedVariant;
-    AdditionalLayoutInfo m_selectedLayoutsAdditionalLayoutInfo;
+
+    // Layout (and corresponding info) added if current one doesn't support ASCII (e.g. Russian or Japanese)
+    AdditionalLayoutInfo m_additionalLayoutInfo;
+
     QTimer m_setxkbmapTimer;
 
     // From configuration

From fe5757c7d1cdbfb0d38ffc7c954b745c1cf43614 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 01:07:49 +0100
Subject: [PATCH 086/228] [keyboard] Matching of layouts is very suspect

---
 src/modules/keyboard/Config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 2df2e8935..9f93d9197 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -381,11 +381,11 @@ Config::guessLayout( const QStringList& langParts )
                 for ( int variantnumber = 0; variantnumber < m_keyboardVariantsModel->rowCount(); ++variantnumber )
                 {
                     if ( m_keyboardVariantsModel->item( variantnumber )[ "key" ].compare( *countryPart,
-                                                                                          Qt::CaseInsensitive ) )
+                                                                                          Qt::CaseInsensitive ) == 0 )
                     {
                         m_keyboardVariantsModel->setCurrentIndex( variantnumber );
                         cDebug() << Logger::SubEntry << "matched variant"
-                                 << m_keyboardVariantsModel->item( variantnumber )[ "key" ] << ' '
+                                 << *countryPart << ' '
                                  << m_keyboardVariantsModel->item( variantnumber )[ "key" ];
                     }
                 }

From d464e98e892c2a396621590ecfbb04844441b4b6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 01:10:05 +0100
Subject: [PATCH 087/228] [keyboard] Move remaining variables to Config

- Config already *has* everythind, but drop the useless copies
  and duplicated code from the Page
- Plug the models model into the Page
- While here, document the model / layout / variant distinctions

The code doesn't fill the UI properly, and the drop-down
for the models combobox is not right, but at least the data
is shared.
---
 src/modules/keyboard/Config.h             | 27 +++++++-----
 src/modules/keyboard/KeyboardPage.cpp     | 54 ++++++-----------------
 src/modules/keyboard/KeyboardPage.h       |  9 +---
 src/modules/keyboard/KeyboardViewStep.cpp |  2 +-
 4 files changed, 34 insertions(+), 58 deletions(-)

diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index 0446da525..fa8728975 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -44,6 +44,23 @@ public:
 
     static AdditionalLayoutInfo getAdditionalLayoutInfo( const QString& layout );
 
+    /* A model is a physical configuration of a keyboard, e.g. 105-key PC
+     * or TKL 88-key physical size.
+     */
+    KeyboardModelsModel* keyboardModels() const;
+    /* A layout describes the basic keycaps / language assigned to the
+     * keys of the physical keyboard, e.g. English (US) or Russian.
+     */
+    KeyboardLayoutModel* keyboardLayouts() const;
+    /* A variant describes a variant of the basic keycaps; this can
+     * concern options (dead keys), or different placements of the keycaps
+     * (dvorak).
+     */
+    KeyboardVariantsModel* keyboardVariants() const;
+
+signals:
+    void prettyStatusChanged();
+
 private:
     void guessLayout( const QStringList& langParts );
     void updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant = QString() );
@@ -65,16 +82,6 @@ private:
     QString m_xOrgConfFileName;
     QString m_convertedKeymapPath;
     bool m_writeEtcDefaultKeyboard = true;
-
-
-protected:
-    KeyboardModelsModel* keyboardModels() const;
-    KeyboardLayoutModel* keyboardLayouts() const;
-    KeyboardVariantsModel* keyboardVariants() const;
-
-
-signals:
-    void prettyStatusChanged();
 };
 
 
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index bfa0b4b42..f26c3d122 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -15,6 +15,7 @@
 
 #include "KeyboardPage.h"
 
+#include "Config.h"
 #include "KeyboardLayoutModel.h"
 #include "SetKeyboardLayoutJob.h"
 #include "keyboardwidget/keyboardpreview.h"
@@ -40,30 +41,32 @@ public:
 
 LayoutItem::~LayoutItem() {}
 
-KeyboardPage::KeyboardPage( QWidget* parent )
+KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
     : QWidget( parent )
     , ui( new Ui::Page_Keyboard )
     , m_keyboardPreview( new KeyBoardPreview( this ) )
-    , m_defaultIndex( 0 )
 {
     ui->setupUi( this );
 
     // Keyboard Preview
     ui->KBPreviewLayout->addWidget( m_keyboardPreview );
 
-    m_setxkbmapTimer.setSingleShot( true );
-
+    ui->comboBoxModel->setModel( config->keyboardModels() );
     // Connect signals and slots
     connect( ui->listVariant, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
 
     connect(
-        ui->buttonRestore, &QPushButton::clicked, [this] { ui->comboBoxModel->setCurrentIndex( m_defaultIndex ); } );
+        ui->buttonRestore, &QPushButton::clicked, [this] {
+            cDebug() << "Restore clicked";
+            // ui->comboBoxModel->setCurrentIndex( m_defaultIndex );
+        } );
 
     connect( ui->comboBoxModel, &QComboBox::currentTextChanged, [this]( const QString& text ) {
-        QString model = m_models.value( text, "pc105" );
+        cDebug() << "ComboBox changed to" << text;
+        // QString model = m_models.value( text, "pc105" );
 
         // Set Xorg keyboard model
-        QProcess::execute( "setxkbmap", QStringList { "-model", model } );
+        // QProcess::execute( "setxkbmap", QStringList { "-model", model } );
     } );
 
     CALAMARES_RETRANSLATE( ui->retranslateUi( this ); )
@@ -128,25 +131,13 @@ KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current, const
     updateVariants( QPersistentModelIndex( current ) );
 }
 
-/* Returns stringlist with suitable setxkbmap command-line arguments
- * to set the given @p layout and @p variant.
- */
-static inline QStringList
-xkbmap_args( const QString& layout, const QString& variant )
-{
-    QStringList r { "-layout", layout };
-    if ( !variant.isEmpty() )
-    {
-        r << "-variant" << variant;
-    }
-    return r;
-}
-
 void
 KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
 {
     Q_UNUSED( previous )
 
+    cDebug() << "item" << Logger::Pointer( current );
+
     QPersistentModelIndex layoutIndex = ui->listLayout->currentIndex();
     LayoutItem* variantItem = dynamic_cast< LayoutItem* >( current );
 
@@ -158,25 +149,8 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi
     QString layout = layoutIndex.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString();
     QString variant = variantItem->data;
 
+    cDebug() << Logger::SubEntry << layout << variant;
+
     m_keyboardPreview->setLayout( layout );
     m_keyboardPreview->setVariant( variant );
-
-    //emit checkReady();
-
-    // Set Xorg keyboard layout
-    if ( m_setxkbmapTimer.isActive() )
-    {
-        m_setxkbmapTimer.stop();
-        m_setxkbmapTimer.disconnect( this );
-    }
-
-    connect( &m_setxkbmapTimer, &QTimer::timeout, this, [=] {
-        QProcess::execute( "setxkbmap", xkbmap_args( layout, variant ) );
-        cDebug() << "xkbmap selection changed to: " << layout << '-' << variant;
-        m_setxkbmapTimer.disconnect( this );
-    } );
-    m_setxkbmapTimer.start( QApplication::keyboardInputInterval() );
-
-    m_selectedLayout = layout;
-    m_selectedVariant = variant;
 }
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index bb2ec17a9..231099d0b 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -27,13 +27,14 @@ namespace Ui
 class Page_Keyboard;
 }
 
+class Config;
 class KeyBoardPreview;
 
 class KeyboardPage : public QWidget
 {
     Q_OBJECT
 public:
-    explicit KeyboardPage( QWidget* parent = nullptr );
+    explicit KeyboardPage( Config* config, QWidget* parent = nullptr );
     ~KeyboardPage() override;
 
 protected slots:
@@ -45,12 +46,6 @@ private:
 
     Ui::Page_Keyboard* ui;
     KeyBoardPreview* m_keyboardPreview;
-    int m_defaultIndex;
-    QMap< QString, QString > m_models;
-
-    QString m_selectedLayout;
-    QString m_selectedVariant;
-    QTimer m_setxkbmapTimer;
 };
 
 #endif  // KEYBOARDPAGE_H
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 80945f848..773ed1401 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -20,7 +20,7 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardViewStepFactory, registerPlugin< Ke
 KeyboardViewStep::KeyboardViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
     , m_config( new Config(this) )
-    , m_widget( new KeyboardPage() )
+    , m_widget( new KeyboardPage( m_config ) )
 {
     m_config->detectCurrentKeyboardLayout();
     emit nextStatusChanged( true );

From 5f1d7b2e8dc6449298dbec13c26edcf0fcd7a0a0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 10:38:51 +0100
Subject: [PATCH 088/228] [keyboard] Rename UI widgets to make code clearer

---
 src/modules/keyboard/KeyboardPage.cpp | 20 ++++++++++----------
 src/modules/keyboard/KeyboardPage.ui  | 12 ++++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index f26c3d122..9ce947ef6 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -51,17 +51,17 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
     // Keyboard Preview
     ui->KBPreviewLayout->addWidget( m_keyboardPreview );
 
-    ui->comboBoxModel->setModel( config->keyboardModels() );
+    ui->physicalModelSelector->setModel( config->keyboardModels() );
     // Connect signals and slots
-    connect( ui->listVariant, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
+    connect( ui->variantSelector, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
 
     connect(
         ui->buttonRestore, &QPushButton::clicked, [this] {
             cDebug() << "Restore clicked";
-            // ui->comboBoxModel->setCurrentIndex( m_defaultIndex );
+            // ui->physicalModelSelector->setCurrentIndex( m_defaultIndex );
         } );
 
-    connect( ui->comboBoxModel, &QComboBox::currentTextChanged, [this]( const QString& text ) {
+    connect( ui->physicalModelSelector, &QComboBox::currentTextChanged, [this]( const QString& text ) {
         cDebug() << "ComboBox changed to" << text;
         // QString model = m_models.value( text, "pc105" );
 
@@ -82,14 +82,14 @@ void
 KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant )
 {
     // Block signals
-    ui->listVariant->blockSignals( true );
+    ui->variantSelector->blockSignals( true );
 
     QMap< QString, QString > variants
         = currentItem.data( KeyboardLayoutModel::KeyboardVariantsRole ).value< QMap< QString, QString > >();
     QMapIterator< QString, QString > li( variants );
     LayoutItem* defaultItem = nullptr;
 
-    ui->listVariant->clear();
+    ui->variantSelector->clear();
 
     while ( li.hasNext() )
     {
@@ -98,7 +98,7 @@ KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem, QString
         LayoutItem* item = new LayoutItem();
         item->setText( li.key() );
         item->data = li.value();
-        ui->listVariant->addItem( item );
+        ui->variantSelector->addItem( item );
 
         // currentVariant defaults to QString(). It is only non-empty during the
         // initial setup.
@@ -109,12 +109,12 @@ KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem, QString
     }
 
     // Unblock signals
-    ui->listVariant->blockSignals( false );
+    ui->variantSelector->blockSignals( false );
 
     // Set to default value
     if ( defaultItem )
     {
-        ui->listVariant->setCurrentItem( defaultItem );
+        ui->variantSelector->setCurrentItem( defaultItem );
     }
 }
 
@@ -138,7 +138,7 @@ KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWi
 
     cDebug() << "item" << Logger::Pointer( current );
 
-    QPersistentModelIndex layoutIndex = ui->listLayout->currentIndex();
+    QPersistentModelIndex layoutIndex = ui->layoutSelector->currentIndex();
     LayoutItem* variantItem = dynamic_cast< LayoutItem* >( current );
 
     if ( !layoutIndex.isValid() || !variantItem )
diff --git a/src/modules/keyboard/KeyboardPage.ui b/src/modules/keyboard/KeyboardPage.ui
index f7e430a04..e8de90dec 100644
--- a/src/modules/keyboard/KeyboardPage.ui
+++ b/src/modules/keyboard/KeyboardPage.ui
@@ -76,7 +76,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
       </widget>
      </item>
      <item>
-      <widget class="QComboBox" name="comboBoxModel">
+      <widget class="QComboBox" name="physicalModelSelector">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -110,10 +110,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
       <number>9</number>
      </property>
      <item>
-      <widget class="QListView" name="listLayout"/>
+      <widget class="QListView" name="layoutSelector"/>
      </item>
      <item>
-      <widget class="QListWidget" name="listVariant"/>
+      <widget class="QListWidget" name="variantSelector"/>
      </item>
     </layout>
    </item>
@@ -139,9 +139,9 @@ SPDX-License-Identifier: GPL-3.0-or-later
   </layout>
  </widget>
  <tabstops>
-  <tabstop>comboBoxModel</tabstop>
-  <tabstop>listLayout</tabstop>
-  <tabstop>listVariant</tabstop>
+  <tabstop>physicalModelSelector</tabstop>
+  <tabstop>layoutSelector</tabstop>
+  <tabstop>variantSelector</tabstop>
   <tabstop>LE_TestKeyboard</tabstop>
   <tabstop>buttonRestore</tabstop>
  </tabstops>

From a1c70b46a1e490682326085ba811dfdbed356ae5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 13:06:43 +0100
Subject: [PATCH 089/228] [keyboard] Typo in comment

---
 src/modules/keyboard/keyboardwidget/keyboardglobal.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/keyboard/keyboardwidget/keyboardglobal.cpp b/src/modules/keyboard/keyboardwidget/keyboardglobal.cpp
index 329913d79..8099cb231 100644
--- a/src/modules/keyboard/keyboardwidget/keyboardglobal.cpp
+++ b/src/modules/keyboard/keyboardwidget/keyboardglobal.cpp
@@ -75,7 +75,7 @@ parseKeyboardModels( const char* filepath )
             break;
         }
 
-        // here we are in the model section, otherwhise we would continue or break
+        // here we are in the model section, otherwise we would continue or break
         QRegExp rx;
         rx.setPattern( "^\\s+(\\S+)\\s+(\\w.*)\n$" );
 

From 365a2ad6fd5fea34d705974418216575cff5d26f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 13:41:21 +0100
Subject: [PATCH 090/228] [keyboard] Re-do the keyboard physical models model
 from scratch

---
 src/modules/keyboard/Config.cpp              |  78 ++++-----
 src/modules/keyboard/KeyboardLayoutModel.cpp | 172 ++++++++++---------
 src/modules/keyboard/KeyboardLayoutModel.h   |  83 +++++----
 3 files changed, 181 insertions(+), 152 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 9f93d9197..d821146b3 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -50,22 +50,25 @@ xkbmap_layout_args( const QString& layout, const QString& variant )
 }
 
 static inline QStringList
-xkbmap_layout_args( const QStringList& layouts, const QStringList& variants, const QString& switchOption = "grp:alt_shift_toggle")
+xkbmap_layout_args( const QStringList& layouts,
+                    const QStringList& variants,
+                    const QString& switchOption = "grp:alt_shift_toggle" )
 {
     if ( layouts.size() != variants.size() )
     {
-        cError() << "Number of layouts and variants must be equal (empty string should be used if there is no corresponding variant)";
+        cError() << "Number of layouts and variants must be equal (empty string should be used if there is no "
+                    "corresponding variant)";
         return QStringList();
     }
 
-    QStringList r{ "-layout", layouts.join( "," ) };
+    QStringList r { "-layout", layouts.join( "," ) };
 
     if ( !variants.isEmpty() )
     {
         r << "-variant" << variants.join( "," );
     }
 
-    if ( !switchOption.isEmpty())
+    if ( !switchOption.isEmpty() )
     {
         r << "-option" << switchOption;
     }
@@ -88,17 +91,16 @@ xkbmap_query_grp_option()
     do
     {
         outputLine = setxkbmapQuery.readLine();
-    }
-    while( setxkbmapQuery.canReadLine() && !outputLine.startsWith("options:") );
+    } while ( setxkbmapQuery.canReadLine() && !outputLine.startsWith( "options:" ) );
 
-    if( !outputLine.startsWith( "options:" ) )
+    if ( !outputLine.startsWith( "options:" ) )
     {
         return QString();
     }
 
     int index = outputLine.indexOf( "grp:" );
 
-    if( index == -1 )
+    if ( index == -1 )
     {
         return QString();
     }
@@ -106,14 +108,16 @@ xkbmap_query_grp_option()
     //it's either in the end of line or before the other option so \s or ,
     int lastIndex = outputLine.indexOf( QRegExp( "[\\s,]" ), index );
 
-    return outputLine.mid( index, lastIndex-1 );
+    return outputLine.mid( index, lastIndex - 1 );
 }
 
-AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout )
+AdditionalLayoutInfo
+Config::getAdditionalLayoutInfo( const QString& layout )
 {
     QFile layoutTable( ":/non-ascii-layouts" );
 
-    if( !layoutTable.open( QIODevice::ReadOnly | QIODevice::Text ) ) {
+    if ( !layoutTable.open( QIODevice::ReadOnly | QIODevice::Text ) )
+    {
         cError() << "Non-ASCII layout table could not be opened";
         return AdditionalLayoutInfo();
     }
@@ -123,10 +127,9 @@ AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout )
     do
     {
         tableLine = layoutTable.readLine();
-    }
-    while( layoutTable.canReadLine() && !tableLine.startsWith( layout ) );
+    } while ( layoutTable.canReadLine() && !tableLine.startsWith( layout ) );
 
-    if( !tableLine.startsWith( layout ) )
+    if ( !tableLine.startsWith( layout ) )
     {
         return AdditionalLayoutInfo();
     }
@@ -135,10 +138,10 @@ AdditionalLayoutInfo Config::getAdditionalLayoutInfo( const QString &layout )
 
     AdditionalLayoutInfo r;
 
-    r.additionalLayout = tableEntries[1];
-    r.additionalVariant = tableEntries[2] == "-" ? "" : tableEntries[2];
+    r.additionalLayout = tableEntries[ 1 ];
+    r.additionalVariant = tableEntries[ 2 ] == "-" ? "" : tableEntries[ 2 ];
 
-    r.vconsoleKeymap = tableEntries[3];
+    r.vconsoleKeymap = tableEntries[ 3 ];
 
     return r;
 }
@@ -153,7 +156,7 @@ Config::Config( QObject* parent )
 
     // Connect signals and slots
     connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, [&]( int index ) {
-        m_selectedModel = m_keyboardModelsModel->item( index ).value( "key", "pc105" );
+        m_selectedModel = m_keyboardModelsModel->modelKey( index );
         //                      Set Xorg keyboard model
         QProcess::execute( "setxkbmap", xkbmap_model_args( m_selectedModel ) );
         emit prettyStatusChanged();
@@ -182,23 +185,20 @@ Config::Config( QObject* parent )
             {
                 m_additionalLayoutInfo.groupSwitcher = xkbmap_query_grp_option();
 
-                if( m_additionalLayoutInfo.groupSwitcher.isEmpty() )
+                if ( m_additionalLayoutInfo.groupSwitcher.isEmpty() )
                 {
                     m_additionalLayoutInfo.groupSwitcher = "grp:alt_shift_toggle";
                 }
 
-                QProcess::execute( "setxkbmap", xkbmap_layout_args(
-                                       { m_additionalLayoutInfo.additionalLayout, m_selectedLayout },
-                                       { m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
-                                       m_additionalLayoutInfo.groupSwitcher )
-                                   );
+                QProcess::execute( "setxkbmap",
+                                   xkbmap_layout_args( { m_additionalLayoutInfo.additionalLayout, m_selectedLayout },
+                                                       { m_additionalLayoutInfo.additionalVariant, m_selectedVariant },
+                                                       m_additionalLayoutInfo.groupSwitcher ) );
 
 
-
-                cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant
-                         << "(added " << m_additionalLayoutInfo.additionalLayout << "-"
-                         << m_additionalLayoutInfo.additionalVariant << " since current layout is not ASCII-capable)";
-
+                cDebug() << "xkbmap selection changed to: " << m_selectedLayout << '-' << m_selectedVariant << "(added "
+                         << m_additionalLayoutInfo.additionalLayout << "-" << m_additionalLayoutInfo.additionalVariant
+                         << " since current layout is not ASCII-capable)";
             }
             else
             {
@@ -269,15 +269,15 @@ Config::detectCurrentKeyboardLayout()
                 continue;
             }
 
-            int firstQuote = line.indexOf('"');
-            int lastQuote = line.lastIndexOf('"');
+            int firstQuote = line.indexOf( '"' );
+            int lastQuote = line.lastIndexOf( '"' );
 
-            if (firstQuote < 0 || lastQuote < 0 || lastQuote <= firstQuote)
+            if ( firstQuote < 0 || lastQuote < 0 || lastQuote <= firstQuote )
             {
                 continue;
             }
 
-            QStringList split = line.mid(firstQuote+1, lastQuote-firstQuote).split( "+", SplitSkipEmptyParts );
+            QStringList split = line.mid( firstQuote + 1, lastQuote - firstQuote ).split( "+", SplitSkipEmptyParts );
             cDebug() << split;
             if ( split.size() >= 2 )
             {
@@ -324,7 +324,7 @@ Config::prettyStatus() const
 {
     QString status;
     status += tr( "Set keyboard model to %1.<br/>" )
-                  .arg( m_keyboardModelsModel->item( m_keyboardModelsModel->currentIndex() )[ "label" ] );
+                  .arg( m_keyboardModelsModel->modelLabel( m_keyboardModelsModel->currentIndex() ) );
 
     QString layout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).second.description;
     QString variant = m_keyboardVariantsModel->currentIndex() >= 0
@@ -381,11 +381,11 @@ Config::guessLayout( const QStringList& langParts )
                 for ( int variantnumber = 0; variantnumber < m_keyboardVariantsModel->rowCount(); ++variantnumber )
                 {
                     if ( m_keyboardVariantsModel->item( variantnumber )[ "key" ].compare( *countryPart,
-                                                                                          Qt::CaseInsensitive ) == 0 )
+                                                                                          Qt::CaseInsensitive )
+                         == 0 )
                     {
                         m_keyboardVariantsModel->setCurrentIndex( variantnumber );
-                        cDebug() << Logger::SubEntry << "matched variant"
-                                 << *countryPart << ' '
+                        cDebug() << Logger::SubEntry << "matched variant" << *countryPart << ' '
                                  << m_keyboardVariantsModel->item( variantnumber )[ "key" ];
                     }
                 }
@@ -497,8 +497,8 @@ Config::finalize()
 
         if ( !m_additionalLayoutInfo.additionalLayout.isEmpty() )
         {
-            gs->insert( "keyboardAdditionalLayout", m_additionalLayoutInfo.additionalLayout);
-            gs->insert( "keyboardAdditionalLayout", m_additionalLayoutInfo.additionalVariant);
+            gs->insert( "keyboardAdditionalLayout", m_additionalLayoutInfo.additionalLayout );
+            gs->insert( "keyboardAdditionalLayout", m_additionalLayoutInfo.additionalVariant );
             gs->insert( "keyboardVConsoleKeymap", m_additionalLayoutInfo.vconsoleKeymap );
         }
     }
diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 2a4ffa4d6..f0393ba6c 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -10,8 +10,96 @@
 
 #include "KeyboardLayoutModel.h"
 
+#include "utils/Logger.h"
+
 #include <algorithm>
 
+KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
+    : QAbstractListModel( parent )
+{
+    // The models map is from human-readable names (!) to xkb identifier
+    const auto models = KeyboardGlobal::getKeyboardModels();
+    for ( const auto& key : models.keys() )
+    {
+        // So here *key* is the key in the map, which is the human-readable thing,
+        //   while the struct fields are xkb-id, and human-readable
+        m_list << ModelInfo { models[ key ], key };
+    }
+
+    cDebug() << "Loaded" << m_list.count() << "keyboard models";
+}
+
+int
+KeyboardModelsModel::rowCount( const QModelIndex& ) const
+{
+    return m_list.count();
+}
+
+QVariant
+KeyboardModelsModel::data( const QModelIndex& index, int role ) const
+{
+    if ( !index.isValid() )
+    {
+        return QVariant();
+    }
+    if ( index.row() < 0 || index.row() >= m_list.count() )
+    {
+        return QVariant();
+    }
+
+    const auto item = m_list.at( index.row() );
+    switch ( role )
+    {
+    case LabelRole:
+        return item.label;
+    case KeyRole:
+        return item.key;
+    default:
+        return QVariant();
+    }
+    __builtin_unreachable();
+}
+
+QString
+KeyboardModelsModel::modelKey( int index ) const
+{
+    if ( index < 0 || index >= m_list.count() )
+    {
+        return QString();
+    }
+    return m_list[ index ].key;
+}
+
+QString
+KeyboardModelsModel::modelLabel( int index ) const
+{
+    if ( index < 0 || index >= m_list.count() )
+    {
+        return QString();
+    }
+    return m_list[ index ].label;
+}
+
+QHash< int, QByteArray >
+KeyboardModelsModel::roleNames() const
+{
+    return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
+}
+
+void
+KeyboardModelsModel::setCurrentIndex( int index )
+{
+    if ( index >= m_list.count() || index < 0 )
+    {
+        return;
+    }
+    if ( m_currentIndex != index )
+    {
+        m_currentIndex = index;
+        emit currentIndexChanged( m_currentIndex );
+    }
+}
+
 
 KeyboardLayoutModel::KeyboardLayoutModel( QObject* parent )
     : QAbstractListModel( parent )
@@ -100,77 +188,6 @@ KeyboardLayoutModel::currentIndex() const
     return m_currentIndex;
 }
 
-KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
-    : QAbstractListModel( parent )
-{
-    detectModels();
-}
-
-void
-KeyboardModelsModel::detectModels()
-{
-    beginResetModel();
-    const auto models = KeyboardGlobal::getKeyboardModels();
-    auto index = -1;
-    for ( const auto& key : models.keys() )
-    {
-        index++;
-        m_list << QMap< QString, QString > { { "label", key }, { "key", models[ key ] } };
-        if ( models[ key ] == "pc105" )
-        {
-            this->setCurrentIndex( index );
-        }
-    }
-    endResetModel();
-}
-
-void
-KeyboardModelsModel::refresh()
-{
-    m_list.clear();
-    setCurrentIndex( -1 );
-    detectModels();
-}
-
-QVariant
-KeyboardModelsModel::data( const QModelIndex& index, int role ) const
-{
-    if ( !index.isValid() )
-    {
-        return QVariant();
-    }
-    const auto item = m_list.at( index.row() );
-    return role == Qt::DisplayRole ? item[ "label" ] : item[ "key" ];
-}
-
-int
-KeyboardModelsModel::rowCount( const QModelIndex& ) const
-{
-    return m_list.count();
-}
-
-QHash< int, QByteArray >
-KeyboardModelsModel::roleNames() const
-{
-    return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
-}
-
-int
-KeyboardModelsModel::currentIndex() const
-{
-    return m_currentIndex;
-}
-
-const QMap< QString, QString >
-KeyboardModelsModel::item( const int& index ) const
-{
-    if ( index >= m_list.count() || index < 0 )
-    {
-        return QMap< QString, QString >();
-    }
-
-    return m_list.at( index );
-}
 
 const QMap< QString, QString >
 KeyboardVariantsModel::item( const int& index ) const
@@ -183,18 +200,6 @@ KeyboardVariantsModel::item( const int& index ) const
     return m_list.at( index );
 }
 
-void
-KeyboardModelsModel::setCurrentIndex( const int& index )
-{
-    if ( index >= m_list.count() || index < 0 )
-    {
-        return;
-    }
-
-    m_currentIndex = index;
-    emit currentIndexChanged( m_currentIndex );
-}
-
 KeyboardVariantsModel::KeyboardVariantsModel( QObject* parent )
     : QAbstractListModel( parent )
 {
@@ -253,4 +258,3 @@ KeyboardVariantsModel::setVariants( QMap< QString, QString > variants )
     }
     endResetModel();
 }
-
diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index 0fd662263..a7075b798 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -17,6 +17,60 @@
 #include <QMetaType>
 #include <QObject>
 
+/** @brief A list model of the physical keyboard formats ("models" in xkb)
+ *
+ * This model acts like it has a single selection, as well.
+ */
+class KeyboardModelsModel : public QAbstractListModel
+{
+    Q_OBJECT
+    Q_PROPERTY( int currentIndex WRITE setCurrentIndex READ currentIndex NOTIFY currentIndexChanged )
+
+public:
+    enum
+    {
+        LabelRole = Qt::DisplayRole,  ///< Human-readable
+        KeyRole = Qt::UserRole  ///< xkb identifier
+    };
+
+    explicit KeyboardModelsModel( QObject* parent = nullptr );
+
+    int rowCount( const QModelIndex& ) const override;
+    QVariant data( const QModelIndex& index, int role ) const override;
+    /** @brief xkb key for a given index (row)
+     *
+     * This is like calling data( QModelIndex( index ), KeyRole ).toString(),
+     * but shorter and faster. Can return an empty string if index is invalid.
+     */
+    QString modelKey( int index ) const;
+
+    /** @brief human-readable label for a given index (row)
+     *
+     * This is like calling data( QModelIndex( index ), LabelRole ).toString(),
+     * but shorter and faster. Can return an empty string if index is invalid.
+     */
+    QString modelLabel( int index ) const;
+
+    QHash< int, QByteArray > roleNames() const override;
+
+    void setCurrentIndex( int index );
+    int currentIndex() const { return m_currentIndex; }
+
+signals:
+    void currentIndexChanged( int index );
+
+private:
+    struct ModelInfo
+    {
+        /// XKB identifier
+        QString key;
+        /// Human-readable
+        QString label;
+    };
+    QVector< ModelInfo > m_list;
+    int m_currentIndex;
+};
+
 class KeyboardLayoutModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -51,35 +105,6 @@ signals:
     void currentIndexChanged( int index );
 };
 
-class KeyboardModelsModel : public QAbstractListModel
-{
-    Q_OBJECT
-    Q_PROPERTY( int currentIndex WRITE setCurrentIndex READ currentIndex NOTIFY currentIndexChanged )
-
-public:
-    explicit KeyboardModelsModel( QObject* parent = nullptr );
-    int rowCount( const QModelIndex& = QModelIndex() ) const override;
-    QVariant data( const QModelIndex& index, int role ) const override;
-
-    void setCurrentIndex( const int& index );
-    int currentIndex() const;
-    const QMap< QString, QString > item( const int& index ) const;
-
-public slots:
-    void refresh();
-
-protected:
-    QHash< int, QByteArray > roleNames() const override;
-
-private:
-    int m_currentIndex = -1;
-    QVector< QMap< QString, QString > > m_list;
-    void detectModels();
-
-signals:
-    void currentIndexChanged( int index );
-};
-
 class KeyboardVariantsModel : public QAbstractListModel
 {
     Q_OBJECT

From 6aedf4401f8a549d2b51be2b3341a16ebd46942f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 13:41:34 +0100
Subject: [PATCH 091/228] [keyboard] Apply coding style

---
 src/modules/keyboard/AdditionalLayoutInfo.h   |  3 ++-
 src/modules/keyboard/Config.h                 |  2 +-
 src/modules/keyboard/KeyboardPage.cpp         | 12 ++++++------
 src/modules/keyboard/KeyboardViewStep.cpp     |  4 ++--
 src/modules/keyboard/SetKeyboardLayoutJob.cpp |  8 +++++---
 src/modules/keyboard/SetKeyboardLayoutJob.h   |  3 +--
 6 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/modules/keyboard/AdditionalLayoutInfo.h b/src/modules/keyboard/AdditionalLayoutInfo.h
index 660449952..61e854d3b 100644
--- a/src/modules/keyboard/AdditionalLayoutInfo.h
+++ b/src/modules/keyboard/AdditionalLayoutInfo.h
@@ -12,7 +12,8 @@
 
 #include <QString>
 
-struct AdditionalLayoutInfo {
+struct AdditionalLayoutInfo
+{
     QString additionalLayout;
     QString additionalVariant;
 
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index fa8728975..e35193484 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -11,9 +11,9 @@
 #ifndef KEYBOARD_CONFIG_H
 #define KEYBOARD_CONFIG_H
 
+#include "AdditionalLayoutInfo.h"
 #include "Job.h"
 #include "KeyboardLayoutModel.h"
-#include "AdditionalLayoutInfo.h"
 
 #include <QAbstractListModel>
 #include <QMap>
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 9ce947ef6..a6b1d3a16 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -53,13 +53,13 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
 
     ui->physicalModelSelector->setModel( config->keyboardModels() );
     // Connect signals and slots
-    connect( ui->variantSelector, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
-
     connect(
-        ui->buttonRestore, &QPushButton::clicked, [this] {
-            cDebug() << "Restore clicked";
-            // ui->physicalModelSelector->setCurrentIndex( m_defaultIndex );
-        } );
+        ui->variantSelector, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
+
+    connect( ui->buttonRestore, &QPushButton::clicked, [this] {
+        cDebug() << "Restore clicked";
+        // ui->physicalModelSelector->setCurrentIndex( m_defaultIndex );
+    } );
 
     connect( ui->physicalModelSelector, &QComboBox::currentTextChanged, [this]( const QString& text ) {
         cDebug() << "ComboBox changed to" << text;
diff --git a/src/modules/keyboard/KeyboardViewStep.cpp b/src/modules/keyboard/KeyboardViewStep.cpp
index 773ed1401..d1eb3eb68 100644
--- a/src/modules/keyboard/KeyboardViewStep.cpp
+++ b/src/modules/keyboard/KeyboardViewStep.cpp
@@ -19,7 +19,7 @@ CALAMARES_PLUGIN_FACTORY_DEFINITION( KeyboardViewStepFactory, registerPlugin< Ke
 
 KeyboardViewStep::KeyboardViewStep( QObject* parent )
     : Calamares::ViewStep( parent )
-    , m_config( new Config(this) )
+    , m_config( new Config( this ) )
     , m_widget( new KeyboardPage( m_config ) )
 {
     m_config->detectCurrentKeyboardLayout();
@@ -109,5 +109,5 @@ KeyboardViewStep::onLeave()
 void
 KeyboardViewStep::setConfigurationMap( const QVariantMap& configurationMap )
 {
-    m_config->setConfigurationMap(configurationMap);
+    m_config->setConfigurationMap( configurationMap );
 }
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 766044179..419d6f3fc 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -30,7 +30,7 @@
 #include <QTextStream>
 
 
-SetKeyboardLayoutJob::SetKeyboardLayoutJob(const QString& model,
+SetKeyboardLayoutJob::SetKeyboardLayoutJob( const QString& model,
                                             const QString& layout,
                                             const QString& variant,
                                             const AdditionalLayoutInfo& additionalLayoutInfo,
@@ -269,12 +269,14 @@ SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const
     {
         if ( !m_layout.isEmpty() )
         {
-            stream << "        Option \"XkbLayout\" \"" << m_additionalLayoutInfo.additionalLayout << "," << m_layout << "\"\n";
+            stream << "        Option \"XkbLayout\" \"" << m_additionalLayoutInfo.additionalLayout << "," << m_layout
+                   << "\"\n";
         }
 
         if ( !m_variant.isEmpty() )
         {
-            stream << "        Option \"XkbVariant\" \"" << m_additionalLayoutInfo.additionalVariant << "," << m_variant << "\"\n";
+            stream << "        Option \"XkbVariant\" \"" << m_additionalLayoutInfo.additionalVariant << "," << m_variant
+                   << "\"\n";
         }
 
         stream << "        Option \"XkbOptions\" \"" << m_additionalLayoutInfo.groupSwitcher << "\"\n";
diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.h b/src/modules/keyboard/SetKeyboardLayoutJob.h
index b1ce0bb15..15fadfb52 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.h
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.h
@@ -11,9 +11,8 @@
 #ifndef SETKEYBOARDLAYOUTJOB_H
 #define SETKEYBOARDLAYOUTJOB_H
 
-#include "Job.h"
 #include "AdditionalLayoutInfo.h"
-
+#include "Job.h"
 
 
 class SetKeyboardLayoutJob : public Calamares::Job

From 193efe171007cad73c3baa2c9e360a7a530a77c6 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 13:52:30 +0100
Subject: [PATCH 092/228] [keyboard] Restore the notion of PC105 default index

---
 src/modules/keyboard/KeyboardLayoutModel.cpp | 6 ++++++
 src/modules/keyboard/KeyboardLayoutModel.h   | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index f0393ba6c..ab7dbd37f 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -19,11 +19,17 @@ KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
 {
     // The models map is from human-readable names (!) to xkb identifier
     const auto models = KeyboardGlobal::getKeyboardModels();
+    int index = 0;
     for ( const auto& key : models.keys() )
     {
         // So here *key* is the key in the map, which is the human-readable thing,
         //   while the struct fields are xkb-id, and human-readable
         m_list << ModelInfo { models[ key ], key };
+        if ( models[ key ] == "pc105" )
+        {
+            m_defaultPC105 = index;
+        }
+        index++;
     }
 
     cDebug() << "Loaded" << m_list.count() << "keyboard models";
diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index a7075b798..d0edac2d1 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -54,6 +54,8 @@ public:
     QHash< int, QByteArray > roleNames() const override;
 
     void setCurrentIndex( int index );
+    /// @brief Set the index back to PC105 (the default physical model)
+    void setCurrentIndex() { setCurrentIndex( m_defaultPC105 ); }
     int currentIndex() const { return m_currentIndex; }
 
 signals:
@@ -68,7 +70,8 @@ private:
         QString label;
     };
     QVector< ModelInfo > m_list;
-    int m_currentIndex;
+    int m_currentIndex = -1;
+    int m_defaultPC105 = -1;  ///< The index of pc105, if there is one
 };
 
 class KeyboardLayoutModel : public QAbstractListModel

From 87aafb2442c3208a256c7c01b92d1b9aa405b1df Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 13:55:21 +0100
Subject: [PATCH 093/228] [keyboard] Tear up connections between widgets and
 model

---
 src/modules/keyboard/Config.cpp       |  7 +++++--
 src/modules/keyboard/KeyboardPage.cpp | 16 +++-------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index d821146b3..13954eb20 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -156,22 +156,25 @@ Config::Config( QObject* parent )
 
     // Connect signals and slots
     connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, [&]( int index ) {
+        // Set Xorg keyboard model
         m_selectedModel = m_keyboardModelsModel->modelKey( index );
-        //                      Set Xorg keyboard model
+        cDebug() << "Setting model" << index << m_selectedModel;
         QProcess::execute( "setxkbmap", xkbmap_model_args( m_selectedModel ) );
         emit prettyStatusChanged();
     } );
 
     connect( m_keyboardLayoutsModel, &KeyboardLayoutModel::currentIndexChanged, [&]( int index ) {
         m_selectedLayout = m_keyboardLayoutsModel->item( index ).first;
+        cDebug() << "Setting layout" << index << m_selectedLayout;
         updateVariants( QPersistentModelIndex( m_keyboardLayoutsModel->index( index ) ) );
         emit prettyStatusChanged();
     } );
 
     connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, [&]( int index ) {
+        // Set Xorg keyboard layout + variant
         m_selectedVariant = m_keyboardVariantsModel->item( index )[ "key" ];
+        cDebug() << "Setting variant" << index << m_selectedVariant;
 
-        // Set Xorg keyboard layout
         if ( m_setxkbmapTimer.isActive() )
         {
             m_setxkbmapTimer.stop();
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index a6b1d3a16..9974f7bf7 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -52,22 +52,12 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
     ui->KBPreviewLayout->addWidget( m_keyboardPreview );
 
     ui->physicalModelSelector->setModel( config->keyboardModels() );
-    // Connect signals and slots
-    connect(
-        ui->variantSelector, &QListWidget::currentItemChanged, this, &KeyboardPage::onListVariantCurrentItemChanged );
+    ui->layoutSelector->setModel( config->keyboardLayouts() );
 
-    connect( ui->buttonRestore, &QPushButton::clicked, [this] {
-        cDebug() << "Restore clicked";
-        // ui->physicalModelSelector->setCurrentIndex( m_defaultIndex );
+    connect( ui->buttonRestore, &QPushButton::clicked, [config=config] {
+        config->keyboardModels()->setCurrentIndex();
     } );
 
-    connect( ui->physicalModelSelector, &QComboBox::currentTextChanged, [this]( const QString& text ) {
-        cDebug() << "ComboBox changed to" << text;
-        // QString model = m_models.value( text, "pc105" );
-
-        // Set Xorg keyboard model
-        // QProcess::execute( "setxkbmap", QStringList { "-model", model } );
-    } );
 
     CALAMARES_RETRANSLATE( ui->retranslateUi( this ); )
 }

From 168be02c964c8971925b60250c39cc019c03a4a3 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 14:03:46 +0100
Subject: [PATCH 094/228] [keyboard] Hook up the model-selection again

---
 src/modules/keyboard/KeyboardPage.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 9974f7bf7..135aa1bc5 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -57,7 +57,10 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
     connect( ui->buttonRestore, &QPushButton::clicked, [config=config] {
         config->keyboardModels()->setCurrentIndex();
     } );
-
+    connect( ui->physicalModelSelector,
+             QOverload<int>::of( &QComboBox::currentIndexChanged ),
+             config->keyboardModels(),
+             QOverload<int>::of( &KeyboardModelsModel::setCurrentIndex ) );
 
     CALAMARES_RETRANSLATE( ui->retranslateUi( this ); )
 }

From 5afe54132bf6bcaaef73f960d25813770f06bf18 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 15:34:47 +0100
Subject: [PATCH 095/228] [keyboard] Use the models from Config

- Remove code that is duplicated in Config.
- Hook up UI for physical keyboard model, and back.
- For now, introduce some named slots with debugging output.
  This makes debugging a lot easier since we have function names
  to work with rather than anonymous lambdas
---
 src/modules/keyboard/KeyboardPage.cpp | 156 ++++++++++++--------------
 src/modules/keyboard/KeyboardPage.h   |  10 +-
 src/modules/keyboard/KeyboardPage.ui  |   2 +-
 3 files changed, 79 insertions(+), 89 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 135aa1bc5..90dacef95 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -45,105 +45,93 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
     : QWidget( parent )
     , ui( new Ui::Page_Keyboard )
     , m_keyboardPreview( new KeyBoardPreview( this ) )
+    , m_config( config )
 {
     ui->setupUi( this );
 
     // Keyboard Preview
     ui->KBPreviewLayout->addWidget( m_keyboardPreview );
 
-    ui->physicalModelSelector->setModel( config->keyboardModels() );
-    ui->layoutSelector->setModel( config->keyboardLayouts() );
+    {
+        auto* model = config->keyboardModels();
+        model->setCurrentIndex();  // To default PC105
+        ui->physicalModelSelector->setModel( model );
+        ui->physicalModelSelector->setCurrentIndex( model->currentIndex() );
+    }
+    {
+        auto* model = config->keyboardLayouts();
+        ui->layoutSelector->setModel( model );
+        ui->layoutSelector->setCurrentIndex( model->index( model->currentIndex() ) );
+    }
+    {
+        auto* model = config->keyboardVariants();
+        ui->variantSelector->setModel( model );
+        ui->variantSelector->setCurrentIndex( model->index( model->currentIndex() ) );
+        cDebug() << "Variants now" << model->rowCount() << model->currentIndex();
+    }
+
+    connect(
+        ui->buttonRestore, &QPushButton::clicked, [config = config] { config->keyboardModels()->setCurrentIndex(); } );
 
-    connect( ui->buttonRestore, &QPushButton::clicked, [config=config] {
-        config->keyboardModels()->setCurrentIndex();
-    } );
     connect( ui->physicalModelSelector,
-             QOverload<int>::of( &QComboBox::currentIndexChanged ),
+             QOverload< int >::of( &QComboBox::currentIndexChanged ),
              config->keyboardModels(),
-             QOverload<int>::of( &KeyboardModelsModel::setCurrentIndex ) );
+             QOverload< int >::of( &KeyboardModelsModel::setCurrentIndex ) );
+    connect( config->keyboardModels(),
+             &KeyboardModelsModel::currentIndexChanged,
+             ui->physicalModelSelector,
+             &QComboBox::setCurrentIndex );
+
+    connect( ui->layoutSelector->selectionModel(),
+             &QItemSelectionModel::currentChanged,
+             this,
+             &KeyboardPage::layoutChangedByUser );
+    connect( config->keyboardLayouts(),
+             &KeyboardLayoutModel::currentIndexChanged,
+             this,
+             &KeyboardPage::layoutChangedByConfig );
+
+    connect( ui->variantSelector->selectionModel(),
+             &QItemSelectionModel::currentChanged,
+             this,
+             &KeyboardPage::variantChangedByUser );
+    connect( config->keyboardVariants(),
+             &KeyboardVariantsModel::currentIndexChanged,
+             this,
+             &KeyboardPage::variantChangedByConfig );
 
     CALAMARES_RETRANSLATE( ui->retranslateUi( this ); )
 }
 
+void
+KeyboardPage::layoutChangedByUser( const QModelIndex& current, const QModelIndex& previous )
+{
+    cDebug() << "index ->" << current.row();
+    m_config->keyboardLayouts()->setCurrentIndex( current.row() );
+    cDebug() << Logger::SubEntry << "variants now" << m_config->keyboardVariants()->rowCount();
+}
+
+void
+KeyboardPage::layoutChangedByConfig( int index )
+{
+    cDebug() << "index ->" << index;
+    ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) );
+    cDebug() << Logger::SubEntry << "variants now" << m_config->keyboardVariants()->rowCount();
+}
+
+void
+KeyboardPage::variantChangedByUser( const QModelIndex& current, const QModelIndex& previous )
+{
+    cDebug() << "index ->" << current.row();
+}
+
+void
+KeyboardPage::variantChangedByConfig( int index )
+{
+    cDebug() << "index ->" << index;
+}
 
 KeyboardPage::~KeyboardPage()
 {
     delete ui;
 }
-
-void
-KeyboardPage::updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant )
-{
-    // Block signals
-    ui->variantSelector->blockSignals( true );
-
-    QMap< QString, QString > variants
-        = currentItem.data( KeyboardLayoutModel::KeyboardVariantsRole ).value< QMap< QString, QString > >();
-    QMapIterator< QString, QString > li( variants );
-    LayoutItem* defaultItem = nullptr;
-
-    ui->variantSelector->clear();
-
-    while ( li.hasNext() )
-    {
-        li.next();
-
-        LayoutItem* item = new LayoutItem();
-        item->setText( li.key() );
-        item->data = li.value();
-        ui->variantSelector->addItem( item );
-
-        // currentVariant defaults to QString(). It is only non-empty during the
-        // initial setup.
-        if ( li.value() == currentVariant )
-        {
-            defaultItem = item;
-        }
-    }
-
-    // Unblock signals
-    ui->variantSelector->blockSignals( false );
-
-    // Set to default value
-    if ( defaultItem )
-    {
-        ui->variantSelector->setCurrentItem( defaultItem );
-    }
-}
-
-
-void
-KeyboardPage::onListLayoutCurrentItemChanged( const QModelIndex& current, const QModelIndex& previous )
-{
-    Q_UNUSED( previous )
-    if ( !current.isValid() )
-    {
-        return;
-    }
-
-    updateVariants( QPersistentModelIndex( current ) );
-}
-
-void
-KeyboardPage::onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous )
-{
-    Q_UNUSED( previous )
-
-    cDebug() << "item" << Logger::Pointer( current );
-
-    QPersistentModelIndex layoutIndex = ui->layoutSelector->currentIndex();
-    LayoutItem* variantItem = dynamic_cast< LayoutItem* >( current );
-
-    if ( !layoutIndex.isValid() || !variantItem )
-    {
-        return;
-    }
-
-    QString layout = layoutIndex.data( KeyboardLayoutModel::KeyboardLayoutKeyRole ).toString();
-    QString variant = variantItem->data;
-
-    cDebug() << Logger::SubEntry << layout << variant;
-
-    m_keyboardPreview->setLayout( layout );
-    m_keyboardPreview->setVariant( variant );
-}
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 231099d0b..582b614e3 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -38,14 +38,16 @@ public:
     ~KeyboardPage() override;
 
 protected slots:
-    void onListLayoutCurrentItemChanged( const QModelIndex& current, const QModelIndex& previous );
-    void onListVariantCurrentItemChanged( QListWidgetItem* current, QListWidgetItem* previous );
+    void layoutChangedByUser( const QModelIndex& current, const QModelIndex& previous );
+    void layoutChangedByConfig( int index );
+
+    void variantChangedByUser( const QModelIndex& current, const QModelIndex& previous );
+    void variantChangedByConfig( int index );
 
 private:
-    void updateVariants( const QPersistentModelIndex& currentItem, QString currentVariant = QString() );
-
     Ui::Page_Keyboard* ui;
     KeyBoardPreview* m_keyboardPreview;
+    Config* m_config;
 };
 
 #endif  // KEYBOARDPAGE_H
diff --git a/src/modules/keyboard/KeyboardPage.ui b/src/modules/keyboard/KeyboardPage.ui
index e8de90dec..f7592fc6a 100644
--- a/src/modules/keyboard/KeyboardPage.ui
+++ b/src/modules/keyboard/KeyboardPage.ui
@@ -113,7 +113,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
       <widget class="QListView" name="layoutSelector"/>
      </item>
      <item>
-      <widget class="QListWidget" name="variantSelector"/>
+      <widget class="QListView" name="variantSelector"/>
      </item>
     </layout>
    </item>

From d536173d66a03deade6c578156cc32a81bbe8d72 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 16:20:02 +0100
Subject: [PATCH 096/228] [keyboard] Factor out a 2-column k-v list

---
 src/modules/keyboard/KeyboardLayoutModel.cpp | 52 +++++++++++---------
 src/modules/keyboard/KeyboardLayoutModel.h   | 29 ++++++++---
 src/modules/keyboard/KeyboardPage.cpp        |  2 +-
 3 files changed, 53 insertions(+), 30 deletions(-)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index ab7dbd37f..4026bfc64 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -14,35 +14,19 @@
 
 #include <algorithm>
 
-KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
+XKBListModel::XKBListModel( QObject* parent )
     : QAbstractListModel( parent )
 {
-    // The models map is from human-readable names (!) to xkb identifier
-    const auto models = KeyboardGlobal::getKeyboardModels();
-    int index = 0;
-    for ( const auto& key : models.keys() )
-    {
-        // So here *key* is the key in the map, which is the human-readable thing,
-        //   while the struct fields are xkb-id, and human-readable
-        m_list << ModelInfo { models[ key ], key };
-        if ( models[ key ] == "pc105" )
-        {
-            m_defaultPC105 = index;
-        }
-        index++;
-    }
-
-    cDebug() << "Loaded" << m_list.count() << "keyboard models";
 }
 
 int
-KeyboardModelsModel::rowCount( const QModelIndex& ) const
+XKBListModel::rowCount( const QModelIndex& ) const
 {
     return m_list.count();
 }
 
 QVariant
-KeyboardModelsModel::data( const QModelIndex& index, int role ) const
+XKBListModel::data( const QModelIndex& index, int role ) const
 {
     if ( !index.isValid() )
     {
@@ -67,7 +51,7 @@ KeyboardModelsModel::data( const QModelIndex& index, int role ) const
 }
 
 QString
-KeyboardModelsModel::modelKey( int index ) const
+XKBListModel::modelKey( int index ) const
 {
     if ( index < 0 || index >= m_list.count() )
     {
@@ -77,7 +61,7 @@ KeyboardModelsModel::modelKey( int index ) const
 }
 
 QString
-KeyboardModelsModel::modelLabel( int index ) const
+XKBListModel::modelLabel( int index ) const
 {
     if ( index < 0 || index >= m_list.count() )
     {
@@ -87,13 +71,13 @@ KeyboardModelsModel::modelLabel( int index ) const
 }
 
 QHash< int, QByteArray >
-KeyboardModelsModel::roleNames() const
+XKBListModel::roleNames() const
 {
     return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
 }
 
 void
-KeyboardModelsModel::setCurrentIndex( int index )
+XKBListModel::setCurrentIndex( int index )
 {
     if ( index >= m_list.count() || index < 0 )
     {
@@ -106,6 +90,28 @@ KeyboardModelsModel::setCurrentIndex( int index )
     }
 }
 
+KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
+    : XKBListModel( parent )
+{
+    // The models map is from human-readable names (!) to xkb identifier
+    const auto models = KeyboardGlobal::getKeyboardModels();
+    m_list.reserve( models.count() );
+    int index = 0;
+    for ( const auto& key : models.keys() )
+    {
+        // So here *key* is the key in the map, which is the human-readable thing,
+        //   while the struct fields are xkb-id, and human-readable
+        m_list << ModelInfo { models[ key ], key };
+        if ( models[ key ] == "pc105" )
+        {
+            m_defaultPC105 = index;
+        }
+        index++;
+    }
+
+    cDebug() << "Loaded" << m_list.count() << "keyboard models";
+}
+
 
 KeyboardLayoutModel::KeyboardLayoutModel( QObject* parent )
     : QAbstractListModel( parent )
diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index d0edac2d1..76b921fd4 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -17,11 +17,12 @@
 #include <QMetaType>
 #include <QObject>
 
-/** @brief A list model of the physical keyboard formats ("models" in xkb)
+/** @brief A list model with an xkb key and a human-readable string
  *
  * This model acts like it has a single selection, as well.
  */
-class KeyboardModelsModel : public QAbstractListModel
+
+class XKBListModel : public QAbstractListModel
 {
     Q_OBJECT
     Q_PROPERTY( int currentIndex WRITE setCurrentIndex READ currentIndex NOTIFY currentIndexChanged )
@@ -33,7 +34,7 @@ public:
         KeyRole = Qt::UserRole  ///< xkb identifier
     };
 
-    explicit KeyboardModelsModel( QObject* parent = nullptr );
+    explicit XKBListModel( QObject* parent = nullptr );
 
     int rowCount( const QModelIndex& ) const override;
     QVariant data( const QModelIndex& index, int role ) const override;
@@ -54,14 +55,12 @@ public:
     QHash< int, QByteArray > roleNames() const override;
 
     void setCurrentIndex( int index );
-    /// @brief Set the index back to PC105 (the default physical model)
-    void setCurrentIndex() { setCurrentIndex( m_defaultPC105 ); }
     int currentIndex() const { return m_currentIndex; }
 
 signals:
     void currentIndexChanged( int index );
 
-private:
+protected:
     struct ModelInfo
     {
         /// XKB identifier
@@ -71,6 +70,24 @@ private:
     };
     QVector< ModelInfo > m_list;
     int m_currentIndex = -1;
+};
+
+
+/** @brief A list model of the physical keyboard formats ("models" in xkb)
+ *
+ * This model acts like it has a single selection, as well.
+ */
+class KeyboardModelsModel : public XKBListModel
+{
+    Q_OBJECT
+
+public:
+    explicit KeyboardModelsModel( QObject* parent = nullptr );
+
+    /// @brief Set the index back to PC105 (the default physical model)
+    void setCurrentIndex() { XKBListModel::setCurrentIndex( m_defaultPC105 ); }
+
+private:
     int m_defaultPC105 = -1;  ///< The index of pc105, if there is one
 };
 
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 90dacef95..28ed3d25a 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -76,7 +76,7 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
     connect( ui->physicalModelSelector,
              QOverload< int >::of( &QComboBox::currentIndexChanged ),
              config->keyboardModels(),
-             QOverload< int >::of( &KeyboardModelsModel::setCurrentIndex ) );
+             QOverload< int >::of( &XKBListModel::setCurrentIndex ) );
     connect( config->keyboardModels(),
              &KeyboardModelsModel::currentIndexChanged,
              ui->physicalModelSelector,

From 14a76a386a1a32030712bfa54a1cdc86ff3e4927 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 16:28:00 +0100
Subject: [PATCH 097/228] [keyboard] Replace broken-ish variants model with k-v
 list

- Use the just-refactored XKBListModel to store the xkb key-value
  pairs for variants, drop most of the complicated implementation,
  store just a single list of values.
---
 src/modules/keyboard/Config.cpp              | 13 ++--
 src/modules/keyboard/KeyboardLayoutModel.cpp | 64 ++------------------
 src/modules/keyboard/KeyboardLayoutModel.h   | 28 ++-------
 3 files changed, 17 insertions(+), 88 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 13954eb20..8cd97f08b 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -157,7 +157,7 @@ Config::Config( QObject* parent )
     // Connect signals and slots
     connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, [&]( int index ) {
         // Set Xorg keyboard model
-        m_selectedModel = m_keyboardModelsModel->modelKey( index );
+        m_selectedModel = m_keyboardModelsModel->key( index );
         cDebug() << "Setting model" << index << m_selectedModel;
         QProcess::execute( "setxkbmap", xkbmap_model_args( m_selectedModel ) );
         emit prettyStatusChanged();
@@ -172,7 +172,7 @@ Config::Config( QObject* parent )
 
     connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, [&]( int index ) {
         // Set Xorg keyboard layout + variant
-        m_selectedVariant = m_keyboardVariantsModel->item( index )[ "key" ];
+        m_selectedVariant = m_keyboardVariantsModel->key( index );
         cDebug() << "Setting variant" << index << m_selectedVariant;
 
         if ( m_setxkbmapTimer.isActive() )
@@ -327,11 +327,11 @@ Config::prettyStatus() const
 {
     QString status;
     status += tr( "Set keyboard model to %1.<br/>" )
-                  .arg( m_keyboardModelsModel->modelLabel( m_keyboardModelsModel->currentIndex() ) );
+                  .arg( m_keyboardModelsModel->label( m_keyboardModelsModel->currentIndex() ) );
 
     QString layout = m_keyboardLayoutsModel->item( m_keyboardLayoutsModel->currentIndex() ).second.description;
     QString variant = m_keyboardVariantsModel->currentIndex() >= 0
-        ? m_keyboardVariantsModel->item( m_keyboardVariantsModel->currentIndex() )[ "label" ]
+        ? m_keyboardVariantsModel->label( m_keyboardVariantsModel->currentIndex() )
         : QString( "<default>" );
     status += tr( "Set keyboard layout to %1/%2." ).arg( layout, variant );
 
@@ -383,13 +383,12 @@ Config::guessLayout( const QStringList& langParts )
                 cDebug() << "Next level:" << *countryPart;
                 for ( int variantnumber = 0; variantnumber < m_keyboardVariantsModel->rowCount(); ++variantnumber )
                 {
-                    if ( m_keyboardVariantsModel->item( variantnumber )[ "key" ].compare( *countryPart,
-                                                                                          Qt::CaseInsensitive )
+                    if ( m_keyboardVariantsModel->key( variantnumber ).compare( *countryPart, Qt::CaseInsensitive )
                          == 0 )
                     {
                         m_keyboardVariantsModel->setCurrentIndex( variantnumber );
                         cDebug() << Logger::SubEntry << "matched variant" << *countryPart << ' '
-                                 << m_keyboardVariantsModel->item( variantnumber )[ "key" ];
+                                 << m_keyboardVariantsModel->key( variantnumber );
                     }
                 }
             }
diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 4026bfc64..5ecc4ccb1 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -51,7 +51,7 @@ XKBListModel::data( const QModelIndex& index, int role ) const
 }
 
 QString
-XKBListModel::modelKey( int index ) const
+XKBListModel::key( int index ) const
 {
     if ( index < 0 || index >= m_list.count() )
     {
@@ -61,7 +61,7 @@ XKBListModel::modelKey( int index ) const
 }
 
 QString
-XKBListModel::modelLabel( int index ) const
+XKBListModel::label( int index ) const
 {
     if ( index < 0 || index >= m_list.count() )
     {
@@ -201,72 +201,20 @@ KeyboardLayoutModel::currentIndex() const
 }
 
 
-const QMap< QString, QString >
-KeyboardVariantsModel::item( const int& index ) const
-{
-    if ( index >= m_list.count() || index < 0 )
-    {
-        return QMap< QString, QString >();
-    }
-
-    return m_list.at( index );
-}
-
 KeyboardVariantsModel::KeyboardVariantsModel( QObject* parent )
-    : QAbstractListModel( parent )
+    : XKBListModel( parent )
 {
 }
 
-int
-KeyboardVariantsModel::currentIndex() const
-{
-    return m_currentIndex;
-}
-
-void
-KeyboardVariantsModel::setCurrentIndex( const int& index )
-{
-    if ( index >= m_list.count() || index < 0 )
-    {
-        return;
-    }
-
-    m_currentIndex = index;
-    emit currentIndexChanged( m_currentIndex );
-}
-
-QVariant
-KeyboardVariantsModel::data( const QModelIndex& index, int role ) const
-{
-    if ( !index.isValid() )
-    {
-        return QVariant();
-    }
-    const auto item = m_list.at( index.row() );
-    return role == Qt::DisplayRole ? item[ "label" ] : item[ "key" ];
-}
-
-int
-KeyboardVariantsModel::rowCount( const QModelIndex& ) const
-{
-    return m_list.count();
-}
-
-QHash< int, QByteArray >
-KeyboardVariantsModel::roleNames() const
-{
-    return { { Qt::DisplayRole, "label" }, { Qt::UserRole, "key" } };
-}
-
 void
 KeyboardVariantsModel::setVariants( QMap< QString, QString > variants )
 {
-    m_list.clear();
     beginResetModel();
+    m_list.clear();
+    m_list.reserve( variants.count() );
     for ( const auto& key : variants.keys() )
     {
-        const auto item = QMap< QString, QString > { { "label", key }, { "key", variants[ key ] } };
-        m_list << item;
+        m_list << ModelInfo { variants[ key ], key };
     }
     endResetModel();
 }
diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index 76b921fd4..9cb2da851 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -36,21 +36,21 @@ public:
 
     explicit XKBListModel( QObject* parent = nullptr );
 
-    int rowCount( const QModelIndex& ) const override;
+    int rowCount( const QModelIndex& = QModelIndex() ) const override;
     QVariant data( const QModelIndex& index, int role ) const override;
     /** @brief xkb key for a given index (row)
      *
      * This is like calling data( QModelIndex( index ), KeyRole ).toString(),
      * but shorter and faster. Can return an empty string if index is invalid.
      */
-    QString modelKey( int index ) const;
+    QString key( int index ) const;
 
     /** @brief human-readable label for a given index (row)
      *
      * This is like calling data( QModelIndex( index ), LabelRole ).toString(),
      * but shorter and faster. Can return an empty string if index is invalid.
      */
-    QString modelLabel( int index ) const;
+    QString label( int index ) const;
 
     QHash< int, QByteArray > roleNames() const override;
 
@@ -125,32 +125,14 @@ signals:
     void currentIndexChanged( int index );
 };
 
-class KeyboardVariantsModel : public QAbstractListModel
+class KeyboardVariantsModel : public XKBListModel
 {
     Q_OBJECT
-    Q_PROPERTY( int currentIndex WRITE setCurrentIndex READ currentIndex NOTIFY currentIndexChanged )
 
 public:
     explicit KeyboardVariantsModel( QObject* parent = nullptr );
+
     void setVariants( QMap< QString, QString > variants );
-
-    int rowCount( const QModelIndex& = QModelIndex() ) const override;
-    QVariant data( const QModelIndex& index, int role ) const override;
-
-    void setCurrentIndex( const int& index );
-    int currentIndex() const;
-
-    const QMap< QString, QString > item( const int& index ) const;
-
-protected:
-    QHash< int, QByteArray > roleNames() const override;
-
-private:
-    int m_currentIndex = -1;
-    QVector< QMap< QString, QString > > m_list;
-
-signals:
-    void currentIndexChanged( int index );
 };
 
 #endif  // KEYBOARDLAYOUTMODEL_H

From 9e141636c54002758ee57071ada2af387097df7c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 16:40:43 +0100
Subject: [PATCH 098/228] [keyboard] Tidy up the debugging output, add docs

---
 src/modules/keyboard/KeyboardLayoutModel.h | 11 +++++++++++
 src/modules/keyboard/KeyboardPage.cpp      |  8 ++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index 9cb2da851..3eef595c3 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -91,6 +91,11 @@ private:
     int m_defaultPC105 = -1;  ///< The index of pc105, if there is one
 };
 
+/** @brief A list of keyboard layouts (arrangements of keycaps)
+ *
+ * Layouts can have a list of associated Variants, so this
+ * is slightly more complicated than the "regular" XKBListModel.
+ */
 class KeyboardLayoutModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -125,6 +130,12 @@ signals:
     void currentIndexChanged( int index );
 };
 
+/** @brief A list of variants (xkb id and human-readable)
+ *
+ * The variants that are available depend on the Layout that is used,
+ * so the `setVariants()` function can be used to update the variants
+ * when the two models are related.
+ */
 class KeyboardVariantsModel : public XKBListModel
 {
     Q_OBJECT
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 28ed3d25a..cb8aada5b 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -106,29 +106,25 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
 void
 KeyboardPage::layoutChangedByUser( const QModelIndex& current, const QModelIndex& previous )
 {
-    cDebug() << "index ->" << current.row();
     m_config->keyboardLayouts()->setCurrentIndex( current.row() );
-    cDebug() << Logger::SubEntry << "variants now" << m_config->keyboardVariants()->rowCount();
 }
 
 void
 KeyboardPage::layoutChangedByConfig( int index )
 {
-    cDebug() << "index ->" << index;
     ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) );
-    cDebug() << Logger::SubEntry << "variants now" << m_config->keyboardVariants()->rowCount();
 }
 
 void
 KeyboardPage::variantChangedByUser( const QModelIndex& current, const QModelIndex& previous )
 {
-    cDebug() << "index ->" << current.row();
+    m_config->keyboardVariants()->setCurrentIndex( current.row() );
 }
 
 void
 KeyboardPage::variantChangedByConfig( int index )
 {
-    cDebug() << "index ->" << index;
+    ui->variantSelector->setCurrentIndex( m_config->keyboardVariants()->index( index ) );
 }
 
 KeyboardPage::~KeyboardPage()

From 0bf28b0b94aa030e5ccf421cdbc709b30abf4216 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 16:47:52 +0100
Subject: [PATCH 099/228] [keyboard] Sanity in setCurrentIndex() parameters

---
 src/modules/keyboard/KeyboardLayoutModel.cpp | 9 ++++++---
 src/modules/keyboard/KeyboardLayoutModel.h   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 5ecc4ccb1..b8cb892f4 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -183,15 +183,18 @@ KeyboardLayoutModel::roleNames() const
 }
 
 void
-KeyboardLayoutModel::setCurrentIndex( const int& index )
+KeyboardLayoutModel::setCurrentIndex( int index )
 {
     if ( index >= m_layouts.count() || index < 0 )
     {
         return;
     }
 
-    m_currentIndex = index;
-    emit currentIndexChanged( m_currentIndex );
+    if ( m_currentIndex != index )
+    {
+        m_currentIndex = index;
+        emit currentIndexChanged( m_currentIndex );
+    }
 }
 
 int
diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index 3eef595c3..60747da55 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -114,7 +114,7 @@ public:
 
     QVariant data( const QModelIndex& index, int role ) const override;
 
-    void setCurrentIndex( const int& index );
+    void setCurrentIndex( int index );
     int currentIndex() const;
     const QPair< QString, KeyboardGlobal::KeyboardInfo > item( const int& index ) const;
 

From 2e5301c5c91e211c73069d72d516dd6218ca63d8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 16:51:34 +0100
Subject: [PATCH 100/228] [keyboard] Simplify back down to lambdas

- With debugging and untangling done, the lambdas are simple
  and short, so return to using them. One point of improvement
  might be to give the models suitable slots themselves,
  to avoid even this indirection.
---
 src/modules/keyboard/KeyboardPage.cpp | 45 +++++----------------------
 src/modules/keyboard/KeyboardPage.h   |  7 -----
 2 files changed, 8 insertions(+), 44 deletions(-)

diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index cb8aada5b..2be897e58 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -84,49 +84,20 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
 
     connect( ui->layoutSelector->selectionModel(),
              &QItemSelectionModel::currentChanged,
-             this,
-             &KeyboardPage::layoutChangedByUser );
-    connect( config->keyboardLayouts(),
-             &KeyboardLayoutModel::currentIndexChanged,
-             this,
-             &KeyboardPage::layoutChangedByConfig );
+             [this]( const QModelIndex& current ) { m_config->keyboardLayouts()->setCurrentIndex( current.row() ); } );
+    connect( config->keyboardLayouts(), &KeyboardLayoutModel::currentIndexChanged, [this]( int index ) {
+        ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) );
+    } );
 
     connect( ui->variantSelector->selectionModel(),
              &QItemSelectionModel::currentChanged,
-             this,
-             &KeyboardPage::variantChangedByUser );
-    connect( config->keyboardVariants(),
-             &KeyboardVariantsModel::currentIndexChanged,
-             this,
-             &KeyboardPage::variantChangedByConfig );
-
+             [this]( const QModelIndex& current ) { m_config->keyboardVariants()->setCurrentIndex( current.row() ); } );
+    connect( config->keyboardVariants(), &KeyboardVariantsModel::currentIndexChanged, [this]( int index ) {
+        ui->variantSelector->setCurrentIndex( m_config->keyboardVariants()->index( index ) );
+    } );
     CALAMARES_RETRANSLATE( ui->retranslateUi( this ); )
 }
 
-void
-KeyboardPage::layoutChangedByUser( const QModelIndex& current, const QModelIndex& previous )
-{
-    m_config->keyboardLayouts()->setCurrentIndex( current.row() );
-}
-
-void
-KeyboardPage::layoutChangedByConfig( int index )
-{
-    ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) );
-}
-
-void
-KeyboardPage::variantChangedByUser( const QModelIndex& current, const QModelIndex& previous )
-{
-    m_config->keyboardVariants()->setCurrentIndex( current.row() );
-}
-
-void
-KeyboardPage::variantChangedByConfig( int index )
-{
-    ui->variantSelector->setCurrentIndex( m_config->keyboardVariants()->index( index ) );
-}
-
 KeyboardPage::~KeyboardPage()
 {
     delete ui;
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 582b614e3..98925fcad 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -37,13 +37,6 @@ public:
     explicit KeyboardPage( Config* config, QWidget* parent = nullptr );
     ~KeyboardPage() override;
 
-protected slots:
-    void layoutChangedByUser( const QModelIndex& current, const QModelIndex& previous );
-    void layoutChangedByConfig( int index );
-
-    void variantChangedByUser( const QModelIndex& current, const QModelIndex& previous );
-    void variantChangedByConfig( int index );
-
 private:
     Ui::Page_Keyboard* ui;
     KeyBoardPreview* m_keyboardPreview;

From cd9c0ea78172e7940f9264bd056123ce59f62492 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 17:00:12 +0100
Subject: [PATCH 101/228] [keyboard] Reduce debugging output

---
 src/modules/keyboard/Config.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 8cd97f08b..6475d9bc8 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -158,14 +158,12 @@ Config::Config( QObject* parent )
     connect( m_keyboardModelsModel, &KeyboardModelsModel::currentIndexChanged, [&]( int index ) {
         // Set Xorg keyboard model
         m_selectedModel = m_keyboardModelsModel->key( index );
-        cDebug() << "Setting model" << index << m_selectedModel;
         QProcess::execute( "setxkbmap", xkbmap_model_args( m_selectedModel ) );
         emit prettyStatusChanged();
     } );
 
     connect( m_keyboardLayoutsModel, &KeyboardLayoutModel::currentIndexChanged, [&]( int index ) {
         m_selectedLayout = m_keyboardLayoutsModel->item( index ).first;
-        cDebug() << "Setting layout" << index << m_selectedLayout;
         updateVariants( QPersistentModelIndex( m_keyboardLayoutsModel->index( index ) ) );
         emit prettyStatusChanged();
     } );
@@ -173,7 +171,6 @@ Config::Config( QObject* parent )
     connect( m_keyboardVariantsModel, &KeyboardVariantsModel::currentIndexChanged, [&]( int index ) {
         // Set Xorg keyboard layout + variant
         m_selectedVariant = m_keyboardVariantsModel->key( index );
-        cDebug() << "Setting variant" << index << m_selectedVariant;
 
         if ( m_setxkbmapTimer.isActive() )
         {

From 018788ddc0de422d583aeda68c4dd96fde8c6488 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 28 Oct 2020 17:07:19 +0100
Subject: [PATCH 102/228] Changes: document Artem's work

---
 CHANGES | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 1f6f104da..8c15405b1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -12,6 +12,7 @@ website will have to do for older versions.
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma
  - Andrius Štikonas
+ - Artem Grinev
  - Gaël PORTAY
 
 ## Core ##
@@ -20,7 +21,9 @@ This release contains contributions from (alphabetically by first name):
    modern KDE Frameworks and KPMcore 4.2.0.
 
 ## Modules ##
- - No module changes yet
+ - The *keyboard* and *keyboardq* modules now share backend code
+   and handle non-ASCII layouts better (for setting passwords
+   and usernames).
 
 
 # 3.2.32.1 (2020-10-17) #

From aeeb4332b053ecccde8666b072e520e3d11b5a9e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 29 Oct 2020 14:26:17 +0100
Subject: [PATCH 103/228] Changes: add Vietnamese translation

---
 CHANGES        |  2 ++
 CMakeLists.txt | 13 +++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 8c15405b1..73c99cf9b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,11 +14,13 @@ This release contains contributions from (alphabetically by first name):
  - Andrius Štikonas
  - Artem Grinev
  - Gaël PORTAY
+ - TTran Me
 
 ## Core ##
  - Calamares now sets the C++ standard for compilation to C++17; this
    is for better compatibility and fewer warnings when building with
    modern KDE Frameworks and KPMcore 4.2.0.
+ - Vietnamese translations have been added. Welcome!
 
 ## Modules ##
  - The *keyboard* and *keyboardq* modules now share backend code
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a83ed6dd8..b20ce50d9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,12 +140,13 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 # NOTE: update these lines by running `txstats.py`, or for full automation
 #       `txstats.py -e`. See also
 #
-# Total 70 languages
-set( _tx_complete ca cs_CZ he hr sq tr_TR uk )
-set( _tx_good as ast az az_AZ be da de es fa fi_FI fr hi hu it_IT
-    ja ko lt ml nl pt_BR pt_PT ru sk sv tg zh_CN zh_TW )
-set( _tx_ok ar bg bn el en_GB es_MX es_PR et eu fur gl id is mr nb
-    pl ro sl sr sr@latin th )
+# Total 71 languages
+set( _tx_complete be ca cs_CZ da fi_FI fur he hi hr ja pt_BR sq sv
+    tg uk vi zh_TW )
+set( _tx_good as ast az az_AZ de es fa fr hu it_IT ko lt ml nl
+    pt_PT ru sk tr_TR zh_CN )
+set( _tx_ok ar bg bn el en_GB es_MX es_PR et eu gl id is mr nb pl
+    ro sl sr sr@latin th )
 set( _tx_incomplete ca@valencia eo fr_CH gu ie kk kn lo lv mk ne_NP
     te ur uz )
 

From e4a8b8358f749494a1b1052f20b5bff12a220aee Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Thu, 29 Oct 2020 14:28:48 +0100
Subject: [PATCH 104/228] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_be.ts    |  155 +-
 lang/calamares_bg.ts    |   12 +-
 lang/calamares_ca.ts    |    2 +-
 lang/calamares_cs_CZ.ts |    2 +-
 lang/calamares_da.ts    |    6 +-
 lang/calamares_fi_FI.ts |    6 +-
 lang/calamares_fur.ts   |  346 ++--
 lang/calamares_he.ts    |   40 +-
 lang/calamares_hi.ts    |    6 +-
 lang/calamares_hr.ts    |    2 +-
 lang/calamares_ja.ts    |    2 +-
 lang/calamares_pt_BR.ts |    6 +-
 lang/calamares_sv.ts    |    6 +-
 lang/calamares_tg.ts    |    6 +-
 lang/calamares_vi.ts    | 4124 +++++++++++++++++++++++++++++++++++++++
 lang/calamares_zh_TW.ts |    6 +-
 16 files changed, 4463 insertions(+), 264 deletions(-)
 create mode 100644 lang/calamares_vi.ts

diff --git a/lang/calamares_be.ts b/lang/calamares_be.ts
index 27c5422ae..41502ddfc 100644
--- a/lang/calamares_be.ts
+++ b/lang/calamares_be.ts
@@ -532,7 +532,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="305"/>
       <source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;strong&gt;Уласнаручная разметка&lt;/strong&gt;&lt;br/&gt;Вы можаце самастойна ствараць раздзелы або змяняць іх памеры.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="831"/>
@@ -621,17 +621,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>На гэтай прыладзе ўжо ўсталяваная аперацыйная сістэма, але табліца раздзелаў &lt;strong&gt;%1&lt;/strong&gt; не такая, як патрэбна &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Адзін з раздзелаў гэтай назапашвальнай прылады&lt;strong&gt;прымантаваны&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Гэтая назапашвальная прылада ёсць часткай&lt;strong&gt;неактыўнага RAID&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
@@ -734,7 +734,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/locale/Config.cpp" line="334"/>
       <source>Set timezone to %1/%2.</source>
-      <translation type="unfinished"/>
+      <translation>Вызначыць часавы пояс %1/%2.</translation>
     </message>
     <message>
       <location filename="../src/modules/locale/Config.cpp" line="372"/>
@@ -794,22 +794,22 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="244"/>
       <source>&lt;h1&gt;Welcome to the Calamares setup program for %1&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Вітаем у праграме ўсталёўкі Calamares для %1&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="245"/>
       <source>&lt;h1&gt;Welcome to %1 setup&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Вітаем у праграме ўсталёўкі %1&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="250"/>
       <source>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Вітаем у праграме ўсталёўкі Calamares для %1&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="251"/>
       <source>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Вітаем у праграме ўсталёўкі %1&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="164"/>
@@ -819,7 +819,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="170"/>
       <source>'%1' is not allowed as username.</source>
-      <translation type="unfinished"/>
+      <translation>'%1' немагчыма выкарыстаць як імя карыстальніка.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="177"/>
@@ -844,7 +844,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="237"/>
       <source>'%1' is not allowed as hostname.</source>
-      <translation type="unfinished"/>
+      <translation>'%1' немагчыма выкарыстаць як назву хоста.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="243"/>
@@ -1817,14 +1817,16 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/localeq/Map.qml" line="243"/>
       <source>Timezone: %1</source>
-      <translation type="unfinished"/>
+      <translation>Часавы пояс: %1</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Map.qml" line="264"/>
       <source>Please select your preferred location on the map so the installer can suggest the locale
             and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging
             to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.</source>
-      <translation type="unfinished"/>
+      <translation>Калі ласка, абярыце неабходнае месца на мапе, каб праграма прапанавала мову
+             і налады часавога пояса.  Вы можаце дакладна наладзіць прапанаваныя параметры ніжэй. Месца на мапе можна абраць перацягваючы
+             яе пры дапамозе мышы. Для павелічэння і памяншэння выкарыстоўвайце кнопкі +/- і кола мышы.</translation>
     </message>
   </context>
   <context>
@@ -1944,7 +1946,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/oemid/OEMPage.ui" line="42"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a batch-identifier here. This will be stored in the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Увядзіце сюды масавы ідэнтыфікатар. Ён захавецца ў мэтавай сістэме.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Увядзіце сюды масавы ідэнтыфікатар. Ён захаваецца ў мэтавай сістэме.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/oemid/OEMPage.ui" line="52"/>
@@ -1970,29 +1972,29 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="37"/>
       <source>Select your preferred Region, or use the default one based on your current location.</source>
-      <translation type="unfinished"/>
+      <translation>Абярыце пераважны рэгіён альбо выкарыстоўвайце прадвызначаны ў залежнасці ад вашага бягучага месцазнаходжання.</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="94"/>
       <location filename="../src/modules/localeq/Offline.qml" line="169"/>
       <location filename="../src/modules/localeq/Offline.qml" line="213"/>
       <source>Timezone: %1</source>
-      <translation type="unfinished"/>
+      <translation>Часавы пояс: %1</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="111"/>
       <source>Select your preferred Zone within your Region.</source>
-      <translation type="unfinished"/>
+      <translation>Абярыце часавы пояс для вашага рэгіёна.</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="182"/>
       <source>Zones</source>
-      <translation type="unfinished"/>
+      <translation>Часавыя паясы</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="229"/>
       <source>You can fine-tune Language and Locale settings below.</source>
-      <translation type="unfinished"/>
+      <translation>Ніжэй вы можаце наладзіць мову і мясцовасць.</translation>
     </message>
   </context>
   <context>
@@ -2644,12 +2646,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="427"/>
       <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;%3&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</source>
-      <translation type="unfinished"/>
+      <translation>Для таго, каб пачаць %1, патрабуецца сістэмны раздзел EFI.&lt;br/&gt;&lt;br/&gt; Каб наладзіць сістэмны раздзел EFI, вярніцеся назад, абярыце альбо стварыце файлавую сістэму FAT32 са сцягам &lt;strong&gt;%3&lt;/strong&gt; і пунктам мантавання &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;Вы можаце працягнуць і без наладкі сістэмнага раздзела EFI, але ваша сістэма можа не загрузіцца.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="441"/>
       <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;%3&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</source>
-      <translation type="unfinished"/>
+      <translation>Для таго, каб пачаць %1, патрабуецца сістэмны раздзел EFI.&lt;br/&gt;&lt;br/&gt;Быў наладжаны раздзел з пунктам мантавання&lt;strong&gt;%2&lt;/strong&gt; але яго сцяг &lt;strong&gt;%3&lt;/strong&gt; не вызначаны.&lt;br/&gt;Каб вызначыць сцяг, вярніцеся назад і адрэдагуйце раздзел.&lt;br/&gt;&lt;br/&gt; Вы можаце працягнуць без наладкі раздзела, але ваша сістэма можа не загрузіцца.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="440"/>
@@ -2868,7 +2870,7 @@ Output:
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
       <source>Directory not found</source>
-      <translation type="unfinished"/>
+      <translation>Каталог не знойдзены</translation>
     </message>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
@@ -2903,7 +2905,8 @@ Output:
       <location filename="../src/modules/welcomeq/Recommended.qml" line="40"/>
       <source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
         Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;p&gt;Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.&lt;br/&gt;
+        Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі.&lt;/p&gt;</translation>
     </message>
   </context>
   <context>
@@ -3014,13 +3017,15 @@ Output:
       <location filename="../src/modules/welcomeq/Requirements.qml" line="38"/>
       <source>&lt;p&gt;This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;
         Installation cannot continue.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;p&gt;Гэты камп’ютар не адпавядае мінімальным патрэбам для ўсталёўкі %1.&lt;p&gt;
+        Немагчыма працягнуць. &lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/Requirements.qml" line="40"/>
       <source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
         Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;p&gt;Гэты камп’ютар адпавядае не ўсім патрэбам для ўсталёўкі %1.&lt;br/&gt;
+        Можна працягнуць усталёўку, але некаторыя магчымасці могуць быць недаступнымі.&lt;/p&gt;</translation>
     </message>
   </context>
   <context>
@@ -3038,7 +3043,7 @@ Output:
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="170"/>
       <source>The file-system resize job has an invalid configuration and will not run.</source>
-      <translation>У задачы па змене памеру файлавай сістэмы хібная канфігурафыя, таму яна не будзе выконвацца.</translation>
+      <translation>У задачы па змене памеру файлавай сістэмы хібная канфігурацыя, таму яна не будзе выконвацца.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="175"/>
@@ -3486,28 +3491,28 @@ Output:
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="122"/>
       <source>KDE user feedback</source>
-      <translation type="unfinished"/>
+      <translation>Зваротная сувязь KDE</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="128"/>
       <source>Configuring KDE user feedback.</source>
-      <translation type="unfinished"/>
+      <translation>Наладка зваротнай сувязі KDE.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="150"/>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="156"/>
       <source>Error in KDE user feedback configuration.</source>
-      <translation type="unfinished"/>
+      <translation>Падчас наладкі зваротнай сувязі KDE адбылася памылка.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="151"/>
       <source>Could not configure KDE user feedback correctly, script error %1.</source>
-      <translation type="unfinished"/>
+      <translation>Не атрымалася наладзіць зваротную сувязь KDE, памылка скрыпта %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="157"/>
       <source>Could not configure KDE user feedback correctly, Calamares error %1.</source>
-      <translation type="unfinished"/>
+      <translation>Не атрымалася наладзіць зваротную сувязь KDE, памылка Calamares %1.</translation>
     </message>
   </context>
   <context>
@@ -3554,7 +3559,7 @@ Output:
     <message>
       <location filename="../src/modules/tracking/page_trackingstep.ui" line="76"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to send &lt;span style=" font-weight:600;"&gt;no information at all&lt;/span&gt; about your installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Пстрыкніце сюды, каб не адпраўляць &lt;span style=" font-weight:600;"&gt;ніякіх звестак&lt;/span&gt; пра вашу ўсталёўку.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/page_trackingstep.ui" line="275"/>
@@ -3564,22 +3569,22 @@ Output:
     <message>
       <location filename="../src/modules/tracking/TrackingPage.cpp" line="86"/>
       <source>Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area.</source>
-      <translation type="unfinished"/>
+      <translation>Адсочванне дапамагае праекту %1 бачыць, як часта ён усталёўваецца, на якім абсталяванні ён усталёўваецца, якія праграмы выкарыстоўваюцца. Каб убачыць, што будзе адпраўлена, пстрыкніце па значку ля кожнай вобласці.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingPage.cpp" line="91"/>
       <source>By selecting this you will send information about your installation and hardware. This information will only be sent &lt;b&gt;once&lt;/b&gt; after the installation finishes.</source>
-      <translation type="unfinished"/>
+      <translation>Абраўшы гэты пункт вы адправіце звесткі пра сваю канфігурацыю ўсталёўкі і ваша абсталяванне. Звесткі адправяцца &lt;b&gt;адзін раз&lt;/b&gt; пасля завяршэння ўсталёўкі.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingPage.cpp" line="94"/>
       <source>By selecting this you will periodically send information about your &lt;b&gt;machine&lt;/b&gt; installation, hardware and applications, to %1.</source>
-      <translation type="unfinished"/>
+      <translation>Абраўшы гэты пункт вы будзеце перыядычна адпраўляць звесткі пра усталёўку, абсталяванне і праграмы вашага &lt;b&gt;камп'ютара&lt;/b&gt; на %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingPage.cpp" line="98"/>
       <source>By selecting this you will regularly send information about your &lt;b&gt;user&lt;/b&gt; installation, hardware, applications and application usage patterns, to %1.</source>
-      <translation type="unfinished"/>
+      <translation>Абраўшы гэты пункт вы будзеце перыядычна адпраўляць звесткі пра усталёўку, абсталяванне, праграмы &lt;b&gt;карыстальніка&lt;/b&gt; і вобласці іх выкарыстання на %1.</translation>
     </message>
   </context>
   <context>
@@ -3625,7 +3630,7 @@ Output:
       <location filename="../src/calamares/VariantModel.cpp" line="232"/>
       <source>Key</source>
       <comment>Column header for key/value</comment>
-      <translation>Клавіша</translation>
+      <translation>Ключ</translation>
     </message>
     <message>
       <location filename="../src/calamares/VariantModel.cpp" line="236"/>
@@ -3783,7 +3788,7 @@ Output:
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="238"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Аўтарскія правы 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Аўтарскія правы 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Шчырыя падзякі &lt;a href="https://calamares.io/team/"&gt;камандзе распрацоўкі Calamares&lt;/a&gt; і &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;камандзе перакладчыкаў Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; распрацоўваецца пры падтрымцы&lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
     </message>
   </context>
   <context>
@@ -3818,7 +3823,17 @@ Output:
                         development is sponsored by &lt;br/&gt;
                         &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
                         Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
+                        &lt;strong&gt;%2&lt;br/&gt;
+                        for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
+                        Аўтарскія правы 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;
+                        Аўтарскія правы 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;
+                        Шчырыя падзякі &lt;a href='https://calamares.io/team/'&gt;камандзе распрацоўкі Calamares &lt;/a&gt; 
+                        і &lt;a href='https://www.transifex.com/calamares/calamares/'&gt; перакладчыкам Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;
+                        &lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt; 
+                        распрацоўваецца пры падтрымцы &lt;br/&gt;
+                        &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; - 
+                        Liberating Software.</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/about.qml" line="96"/>
@@ -3832,13 +3847,15 @@ Output:
       <location filename="../src/modules/localeq/i18n.qml" line="46"/>
       <source>&lt;h1&gt;Languages&lt;/h1&gt; &lt;/br&gt;
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Мовы&lt;/h1&gt;&lt;/br&gt;
+                    Сістэмныя рэгіянальныя налады вызначаюць мову і кадаванне для пэўных элементаў інтэрфейсу загаднага радка. Бягучыя налады &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/i18n.qml" line="106"/>
       <source>&lt;h1&gt;Locales&lt;/h1&gt; &lt;/br&gt;
                     The system locale setting affects the numbers and dates format. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Рэгіянальныя налады&lt;/h1&gt;&lt;/br&gt;
+                    Сістэмныя рэгіянальныя налады вызначаюць фармат нумароў і датаў. Бягучыя налады &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/i18n.qml" line="158"/>
@@ -3866,7 +3883,7 @@ Output:
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
       <source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
-      <translation type="unfinished"/>
+      <translation>Пстрыкніце на пераважную мадэль клавіятуры, каб абраць раскладку і варыянт, альбо выкарыстоўвайце прадвызначаную ў залежнасці ад выяўленага абсталявання.</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@@ -3881,7 +3898,7 @@ Output:
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
       <source>Keyboard Variant</source>
-      <translation type="unfinished"/>
+      <translation>Варыянт клавіятуры</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@@ -3894,7 +3911,7 @@ Output:
     <message>
       <location filename="../src/modules/localeq/localeq.qml" line="81"/>
       <source>Change</source>
-      <translation type="unfinished"/>
+      <translation>Змяніць</translation>
     </message>
   </context>
   <context>
@@ -3932,7 +3949,28 @@ Output:
             &lt;/ul&gt;
 
             &lt;p&gt;The vertical scrollbar is adjustable, current width set to 10.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h3&gt;%1&lt;/h3&gt;
+             &lt;p&gt;Гэта прыклад файла QML, у якім паказваюцца параметры RichText са зменным змесцівам.&lt;/p&gt;
+
+             &lt;p&gt;QML з RichText можа выкарыстоўваць пазнакі HTML. Зменнае змесціва карысна для сэнсарных экранаў.&lt;/p&gt;
+
+             &lt;p&gt;&lt;b&gt;Гэта паўтлусты тэкст&lt;/b&gt;&lt;/p&gt;
+             &lt;p&gt;&lt;i&gt;Гэта тэкст курсівам&lt;/i&gt;&lt;/p&gt;
+             &lt;p&gt;&lt;u&gt;Гэта падкрэслены&lt;/u&gt;&lt;/p&gt;
+             &lt;p&gt;&lt;center&gt;Гэта выраўнаваны па цэнтры тэкст.&lt;/center&gt;&lt;s&gt;
+             &lt;p&gt;&lt;s&gt;Гэта закрэслены тэкст&lt;/s&gt;&lt;/p&gt;
+
+             &lt;p&gt;Прыклад кода:
+             &lt;code&gt;ls -l /
+/home&lt;/code&gt;&lt;/p&gt;
+
+            &lt;p&gt;&lt;b&gt;Спісы:&lt;/b&gt;&lt;/p&gt;
+            &lt;ul&gt;
+                &lt;li&gt;Сістэмы з Intel CPU&lt;/li&gt;
+                &lt;li&gt;Сістэмы з AMD CPU&lt;/li&gt;
+            &lt;/ul&gt;
+
+            &lt;p&gt;Вертыкальная паласа пракруткі наладжваецца. Бягучая шырыня - 10.&lt;/p&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/release_notes.qml" line="76"/>
@@ -3945,7 +3983,7 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="36"/>
       <source>Pick your user name and credentials to login and perform admin tasks</source>
-      <translation type="unfinished"/>
+      <translation>Абярыце свае імя карыстальніка і ўліковыя даныя для ўваходу і выканання задач адміністратара</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@@ -3965,12 +4003,12 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="87"/>
       <source>Login Name</source>
-      <translation type="unfinished"/>
+      <translation>Лагін</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="103"/>
       <source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
-      <translation type="unfinished"/>
+      <translation>Калі камп’ютарам карыстаецца некалькі чалавек, то вы можаце стварыць для іх акаўнты пасля завяршэння ўсталёўкі.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="118"/>
@@ -3985,7 +4023,7 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="140"/>
       <source>This name will be used if you make the computer visible to others on a network.</source>
-      <translation type="unfinished"/>
+      <translation>Назва будзе выкарыстоўвацца для пазначэння камп’ютара ў сетцы.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@@ -4005,12 +4043,12 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="204"/>
       <source>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.</source>
-      <translation type="unfinished"/>
+      <translation>Увядзіце двойчы аднолькавы пароль. Гэта неабходна для таго, каб пазбегнуць памылак. Надзейны пароль павінен складацца з літар, лічбаў, знакаў пунктуацыі. Ён павінен змяшчаць прынамсі 8 знакаў, яго перыядычна трэба змяняць.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="216"/>
       <source>Validate passwords quality</source>
-      <translation type="unfinished"/>
+      <translation>Праверка якасці пароляў</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="226"/>
@@ -4020,12 +4058,12 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="234"/>
       <source>Log in automatically without asking for the password</source>
-      <translation type="unfinished"/>
+      <translation>Аўтаматычна ўваходзіць без уводу пароля</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="243"/>
       <source>Reuse user password as root password</source>
-      <translation type="unfinished"/>
+      <translation>Выкарыстоўваць пароль карыстальніка як пароль адміністратара</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@@ -4035,22 +4073,22 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="268"/>
       <source>Choose a root password to keep your account safe.</source>
-      <translation type="unfinished"/>
+      <translation>Абярыце пароль адміністратара для абароны вашага акаўнта.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="279"/>
       <source>Root Password</source>
-      <translation type="unfinished"/>
+      <translation>Пароль адміністратара</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="298"/>
       <source>Repeat Root Password</source>
-      <translation type="unfinished"/>
+      <translation>Паўтарыце пароль адміністратара</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="318"/>
       <source>Enter the same password twice, so that it can be checked for typing errors.</source>
-      <translation type="unfinished"/>
+      <translation>Увядзіце пароль двойчы, каб пазбегнуць памылак уводу.</translation>
     </message>
   </context>
   <context>
@@ -4059,7 +4097,8 @@ Output:
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="35"/>
       <source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;
             &lt;p&gt;This program will ask you some questions and set up %1 on your computer.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h3&gt;Вітаем у %1, праграме ўсталёўкі&lt;quote&gt;%2&lt;/quote&gt; &lt;/h3&gt;
+            &lt;p&gt;Гэтая праграма дапаможа вам усталяваць %1 на ваш камп'ютар.&lt;/p&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
diff --git a/lang/calamares_bg.ts b/lang/calamares_bg.ts
index b2a6b2b02..cacab19d0 100644
--- a/lang/calamares_bg.ts
+++ b/lang/calamares_bg.ts
@@ -6,7 +6,7 @@
     <message>
       <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="61"/>
       <source>The &lt;strong&gt;boot environment&lt;/strong&gt; of this system.&lt;br&gt;&lt;br&gt;Older x86 systems only support &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Modern systems usually use &lt;strong&gt;EFI&lt;/strong&gt;, but may also show up as BIOS if started in compatibility mode.</source>
-      <translation>&lt;strong&gt;Среда за начално зареждане&lt;/strong&gt; на тази система.&lt;br&gt;&lt;br&gt;Старите x86 системи поддържат само &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Модерните системи обикновено използват &lt;strong&gt;EFI&lt;/strong&gt;, но може също така да използват BIOS, ако са стартирани в режим на съвместимост.</translation>
+      <translation>&lt;strong&gt;Средата за начално зареждане&lt;/strong&gt; на тази система.&lt;br&gt;&lt;br&gt;Старите x86 системи поддържат само &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Модерните системи обикновено използват &lt;strong&gt;EFI&lt;/strong&gt;, но може също така да използват BIOS, ако са стартирани в режим на съвместимост.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/>
@@ -132,7 +132,7 @@
     <message>
       <location filename="../src/libcalamares/JobExample.cpp" line="29"/>
       <source>Job failed (%1)</source>
-      <translation type="unfinished"/>
+      <translation>Задачата се провали (%1)</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/JobExample.cpp" line="30"/>
@@ -153,7 +153,7 @@
     <message>
       <location filename="../src/libcalamares/JobExample.cpp" line="17"/>
       <source>Example job (%1)</source>
-      <translation type="unfinished"/>
+      <translation>Примерна задача (%1)</translation>
     </message>
   </context>
   <context>
@@ -199,7 +199,7 @@
     <message>
       <location filename="../src/libcalamares/PythonJob.cpp" line="229"/>
       <source>Main script file %1 for python job %2 is not readable.</source>
-      <translation>Файлът на главен скрипт %1 за python задача %2 не се чете.</translation>
+      <translation>Файла на главен скрипт %1 за python задача %2 не се чете.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/PythonJob.cpp" line="297"/>
@@ -3755,12 +3755,12 @@ Output:
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="222"/>
       <source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
-      <translation>&lt;h1&gt;Добре дошли при инсталатора Calamares на %1.&lt;/h1&gt;</translation>
+      <translation>&lt;h1&gt;Добре дошли в инсталатора Calamares за %1.&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
       <source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source>
-      <translation>&lt;h1&gt;Добре дошли при инсталатора на %1.&lt;/h1&gt;</translation>
+      <translation>&lt;h1&gt;Добре дошли в инсталатора на %1.&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="228"/>
diff --git a/lang/calamares_ca.ts b/lang/calamares_ca.ts
index 07df2503f..49d14be33 100644
--- a/lang/calamares_ca.ts
+++ b/lang/calamares_ca.ts
@@ -619,7 +619,7 @@ L'instal·lador es tancarà i tots els canvis es perdran.</translation>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Aquest dispositiu d'emmagatzematge ja té un sistema operatiu, però la taula de particions &lt;strong&gt;%1&lt;/strong&gt; és diferent de la necessària: &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt; </translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
diff --git a/lang/calamares_cs_CZ.ts b/lang/calamares_cs_CZ.ts
index 2ceef9619..7f63af78e 100644
--- a/lang/calamares_cs_CZ.ts
+++ b/lang/calamares_cs_CZ.ts
@@ -623,7 +623,7 @@ Instalační program bude ukončen a všechny změny ztraceny.</translation>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Na tomto úložném zařízení se už nachází operační systém, ale tabulka rozdělení &lt;strong&gt;%1&lt;/strong&gt; je jiná než potřebná &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
diff --git a/lang/calamares_da.ts b/lang/calamares_da.ts
index e2fc21085..e5593c7d0 100644
--- a/lang/calamares_da.ts
+++ b/lang/calamares_da.ts
@@ -619,17 +619,17 @@ Installationsprogrammet vil stoppe og alle ændringer vil gå tabt.</translation
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Lagerenheden har allerede et styresystem på den men partitionstabellen &lt;strong&gt;%1&lt;/strong&gt; er ikke magen til den nødvendige &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Lagerenhden har en af sine partitioner &lt;strong&gt;monteret&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Lagringsenheden er en del af en &lt;strong&gt;inaktiv RAID&lt;/strong&gt;-enhed.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
diff --git a/lang/calamares_fi_FI.ts b/lang/calamares_fi_FI.ts
index e3ff2229e..1bf0d09cc 100644
--- a/lang/calamares_fi_FI.ts
+++ b/lang/calamares_fi_FI.ts
@@ -619,17 +619,17 @@ Asennusohjelma sulkeutuu ja kaikki muutoksesi katoavat.</translation>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Tässä kiintolevyssä on jo käyttöjärjestelmä, mutta osiotaulukko &lt;strong&gt;%1&lt;/strong&gt; on erilainen kuin tarvittava &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Tähän kiintolevyyn on &lt;strong&gt;asennettu&lt;/strong&gt; yksi osioista.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Tämä kiintolevy on osa &lt;strong&gt;passiivista RAID&lt;/strong&gt; -laitetta.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
diff --git a/lang/calamares_fur.ts b/lang/calamares_fur.ts
index 7575c0e2a..d2f3a8127 100644
--- a/lang/calamares_fur.ts
+++ b/lang/calamares_fur.ts
@@ -153,7 +153,7 @@
     <message>
       <location filename="../src/libcalamares/JobExample.cpp" line="17"/>
       <source>Example job (%1)</source>
-      <translation>Operazion di esempli (%1)</translation>
+      <translation>Lavôr di esempli (%1)</translation>
     </message>
   </context>
   <context>
@@ -189,7 +189,7 @@
     <message>
       <location filename="../src/libcalamares/PythonJob.cpp" line="222"/>
       <source>Working directory %1 for python job %2 is not readable.</source>
-      <translation>No si rive a lei la cartele di lavôr %1 pe ativitât di python %2.</translation>
+      <translation>No si rive a lei la cartele di lavôr %1 pe operazion di python %2.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/PythonJob.cpp" line="228"/>
@@ -199,7 +199,7 @@
     <message>
       <location filename="../src/libcalamares/PythonJob.cpp" line="229"/>
       <source>Main script file %1 for python job %2 is not readable.</source>
-      <translation>No si rive a lei il file di script principâl %1 pe ativitât di python %2.</translation>
+      <translation>No si rive a lei il file di script principâl %1 pe operazion di python %2.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/PythonJob.cpp" line="297"/>
@@ -2258,7 +2258,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
     <message>
       <location filename="../src/modules/packagechooser/page_package.ui" line="57"/>
       <source>TextLabel</source>
-      <translation type="unfinished"/>
+      <translation>EticheteTest</translation>
     </message>
     <message>
       <location filename="../src/modules/packagechooser/page_package.ui" line="73"/>
@@ -2366,7 +2366,7 @@ Il program di instalazion al jessarà e dutis lis modifichis a laran pierdudis.<
       <location filename="../src/modules/users/page_usersetup.ui" line="349"/>
       <location filename="../src/modules/users/page_usersetup.ui" line="374"/>
       <source>&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;</source>
-      <translation>&lt;small&gt;Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di scriture. Une buine password e contignarà un miscliç di letaris, numars e puntuazions, e sarà lungje almancul vot caratars, e si scugnarà cambiâle a intervai regolârs.&lt;/small&gt;</translation>
+      <translation>&lt;small&gt;Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. Une buine password e contignarà un miscliç di letaris, numars e puntuazions, e sarà lungje almancul vot caratars, e si scugnarà cambiâle a intervai regolârs.&lt;/small&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/users/page_usersetup.ui" line="355"/>
@@ -2791,7 +2791,7 @@ Output:
     <message>
       <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="429"/>
       <source>Bad parameters for process job call.</source>
-      <translation>Parametris sbaliâts par processâ la clamade dal lavôr.</translation>
+      <translation>Parametris sbaliâts par processâ la clamade de operazion.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="433"/>
@@ -2979,24 +2979,24 @@ Output:
     <message>
       <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="207"/>
       <source>%1 system partition (%2)</source>
-      <translation type="unfinished"/>
+      <translation>%1 partizion di sisteme (%2)</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="218"/>
       <source>&lt;strong&gt;%4&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;strong&gt;%4&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;La partizion %1 e je masse piçule par %2. Selezione une partizion cun almancul %3 GiB di capacitât.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="240"/>
       <source>&lt;strong&gt;%2&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;strong&gt;%2&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;No si rive a cjatâ di nissune bande su cheste machine une partizion di sisteme EFI. Par plasê torne indaûr e dopre il partizionament manuâl par configurâ %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
       <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="267"/>
       <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="292"/>
       <source>&lt;strong&gt;%3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;%1 will be installed on %2.&lt;br/&gt;&lt;font color="red"&gt;Warning: &lt;/font&gt;all data on partition %2 will be lost.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;strong&gt;%3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Si instalarà %1 su %2.&lt;br/&gt;&lt;font color="red"&gt;Atenzion: &lt;/font&gt;ducj i dâts de partizion %2 a laran pierdûts.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="259"/>
@@ -3015,7 +3015,8 @@ Output:
       <location filename="../src/modules/welcomeq/Requirements.qml" line="38"/>
       <source>&lt;p&gt;This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;
         Installation cannot continue.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;p&gt;Chest computer nol sodisfe i recuisîts minims pe instalazion di %1.&lt;br/&gt;
+        La instalazion no pues continuâ.&lt;/p&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/Requirements.qml" line="40"/>
@@ -3030,27 +3031,27 @@ Output:
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="46"/>
       <source>Resize Filesystem Job</source>
-      <translation type="unfinished"/>
+      <translation>Operazion di ridimensionament dal filesystem</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="169"/>
       <source>Invalid configuration</source>
-      <translation type="unfinished"/>
+      <translation>Configurazion no valide</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="170"/>
       <source>The file-system resize job has an invalid configuration and will not run.</source>
-      <translation type="unfinished"/>
+      <translation>La operazion di ridimensionament dal filesystem e à une configurazion no valide e no vignarà eseguide.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="175"/>
       <source>KPMCore not Available</source>
-      <translation type="unfinished"/>
+      <translation>KPMCore no disponibil</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="176"/>
       <source>Calamares cannot start KPMCore for the file-system resize job.</source>
-      <translation type="unfinished"/>
+      <translation>Calamares nol rive a inviâ KPMCore pe operazion di ridimensionament dal filesystem.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="184"/>
@@ -3059,39 +3060,39 @@ Output:
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="213"/>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="231"/>
       <source>Resize Failed</source>
-      <translation type="unfinished"/>
+      <translation>Ridimensionament falît</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="186"/>
       <source>The filesystem %1 could not be found in this system, and cannot be resized.</source>
-      <translation type="unfinished"/>
+      <translation>Nol è stât pussibil cjatâ in chest sisteme il filesystem %1 e duncje nol pues jessi ridimensionât.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/>
       <source>The device %1 could not be found in this system, and cannot be resized.</source>
-      <translation type="unfinished"/>
+      <translation>Nol è stât pussibil cjatâ in chest sisteme il dispositîf %1 e duncje nol pues jessi ridimensionât.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="195"/>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/>
       <source>The filesystem %1 cannot be resized.</source>
-      <translation type="unfinished"/>
+      <translation>Impussibil ridimensionâ il filesystem %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="196"/>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/>
       <source>The device %1 cannot be resized.</source>
-      <translation type="unfinished"/>
+      <translation>Impussibil ridimensionâ il dispositîf %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="214"/>
       <source>The filesystem %1 must be resized, but cannot.</source>
-      <translation type="unfinished"/>
+      <translation>Si scugne ridimensionâ il filesystem %1, ma no si rive.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/>
       <source>The device %1 must be resized, but cannot</source>
-      <translation type="unfinished"/>
+      <translation>Si scugne ridimensionâ il filesystem %1, ma no si rive.</translation>
     </message>
   </context>
   <context>
@@ -3099,22 +3100,22 @@ Output:
     <message>
       <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="40"/>
       <source>Resize partition %1.</source>
-      <translation type="unfinished"/>
+      <translation>Ridimensionâ partizion %1</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="47"/>
       <source>Resize &lt;strong&gt;%2MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; to &lt;strong&gt;%3MiB&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Ridimensionâ la partizion &lt;strong&gt;%1&lt;/strong&gt; di &lt;strong&gt;%2MiB&lt;/strong&gt; a &lt;strong&gt;%3MiB&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="58"/>
       <source>Resizing %2MiB partition %1 to %3MiB.</source>
-      <translation type="unfinished"/>
+      <translation>Ridimensionâ la partizion %1 di %2MiB a %3MiB.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="77"/>
       <source>The installer failed to resize partition %1 on disk '%2'.</source>
-      <translation type="unfinished"/>
+      <translation>Il program di instalazion nol è rivât a ridimensionâ la partizion %1 sul disc '%2'.</translation>
     </message>
   </context>
   <context>
@@ -3131,17 +3132,17 @@ Output:
       <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="27"/>
       <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="45"/>
       <source>Resize volume group named %1 from %2 to %3.</source>
-      <translation type="unfinished"/>
+      <translation>Ridimensionâ il grup di volums clamât %1 di %2 a %3.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="36"/>
       <source>Resize volume group named &lt;strong&gt;%1&lt;/strong&gt; from &lt;strong&gt;%2&lt;/strong&gt; to &lt;strong&gt;%3&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Ridimensionâ il grup di volums clamât &lt;strong&gt;%1&lt;/strong&gt; di &lt;strong&gt;%2&lt;/strong&gt; a &lt;strong&gt;%3&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="60"/>
       <source>The installer failed to resize a volume group named '%1'.</source>
-      <translation type="unfinished"/>
+      <translation>Il program di instalazion nol è rivât a ridimensionâ un grup di volums clamât '%1'.</translation>
     </message>
   </context>
   <context>
@@ -3149,12 +3150,12 @@ Output:
     <message>
       <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="133"/>
       <source>For best results, please ensure that this computer:</source>
-      <translation type="unfinished"/>
+      <translation>Par otignî i miôrs risultâts, siguriti che chest computer:</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="134"/>
       <source>System requirements</source>
-      <translation type="unfinished"/>
+      <translation>Recuisîts di sisteme</translation>
     </message>
   </context>
   <context>
@@ -3190,12 +3191,12 @@ Output:
     <message>
       <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="64"/>
       <source>Scanning storage devices...</source>
-      <translation type="unfinished"/>
+      <translation>Scandai dai dispositîfs di memorie...</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="64"/>
       <source>Partitioning</source>
-      <translation type="unfinished"/>
+      <translation>Partizionament</translation>
     </message>
   </context>
   <context>
@@ -3203,29 +3204,29 @@ Output:
     <message>
       <location filename="../src/modules/users/SetHostNameJob.cpp" line="37"/>
       <source>Set hostname %1</source>
-      <translation type="unfinished"/>
+      <translation>Stabilî il non-host a %1</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetHostNameJob.cpp" line="44"/>
       <source>Set hostname &lt;strong&gt;%1&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Stabilî il non-host a &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetHostNameJob.cpp" line="51"/>
       <source>Setting hostname %1.</source>
-      <translation type="unfinished"/>
+      <translation>Daûr a stabilî il non-host a %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetHostNameJob.cpp" line="122"/>
       <location filename="../src/modules/users/SetHostNameJob.cpp" line="129"/>
       <source>Internal Error</source>
-      <translation type="unfinished"/>
+      <translation>Erôr interni</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetHostNameJob.cpp" line="137"/>
       <location filename="../src/modules/users/SetHostNameJob.cpp" line="146"/>
       <source>Cannot write hostname to target system</source>
-      <translation type="unfinished"/>
+      <translation>Impussibil scrivi il non-host sul sisteme di destinazion</translation>
     </message>
   </context>
   <context>
@@ -3233,29 +3234,29 @@ Output:
     <message>
       <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="53"/>
       <source>Set keyboard model to %1, layout to %2-%3</source>
-      <translation type="unfinished"/>
+      <translation>Stabilî il model di tastiere a %1, disposizion a %2-%3</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="356"/>
       <source>Failed to write keyboard configuration for the virtual console.</source>
-      <translation type="unfinished"/>
+      <translation>No si è rivâts a scrivi la configurazion de tastiere pe console virtuâl.</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="357"/>
       <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="361"/>
       <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="368"/>
       <source>Failed to write to %1</source>
-      <translation type="unfinished"/>
+      <translation>No si è rivâts a scrivi su %1</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="360"/>
       <source>Failed to write keyboard configuration for X11.</source>
-      <translation type="unfinished"/>
+      <translation>No si è rivâts a scrivi la configurazion de tastiere par X11.</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="367"/>
       <source>Failed to write keyboard configuration to existing /etc/default directory.</source>
-      <translation type="unfinished"/>
+      <translation>No si è rivâts a scrivi la configurazion de tastiere te cartele esistente /etc/default .</translation>
     </message>
   </context>
   <context>
@@ -3346,42 +3347,42 @@ Output:
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="40"/>
       <source>Set password for user %1</source>
-      <translation type="unfinished"/>
+      <translation>Stabilî la password pal utent %1</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="47"/>
       <source>Setting password for user %1.</source>
-      <translation type="unfinished"/>
+      <translation>Daûr a stabilî la password pal utent %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="81"/>
       <source>Bad destination system path.</source>
-      <translation type="unfinished"/>
+      <translation>Percors di sisteme de destinazion sbaliât.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="82"/>
       <source>rootMountPoint is %1</source>
-      <translation type="unfinished"/>
+      <translation>Il rootMountPoint (pont di montaç de lidrîs) al è %1</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="88"/>
       <source>Cannot disable root account.</source>
-      <translation type="unfinished"/>
+      <translation>Impussibil disabilitâ l'account di root.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
       <source>passwd terminated with error code %1.</source>
-      <translation type="unfinished"/>
+      <translation>passwd terminât cun codiç di erôr %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="97"/>
       <source>Cannot set password for user %1.</source>
-      <translation type="unfinished"/>
+      <translation>Impussibil stabilî la password pal utent %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="98"/>
       <source>usermod terminated with error code %1.</source>
-      <translation type="unfinished"/>
+      <translation>usermod terminât cun codiç di erôr %1.</translation>
     </message>
   </context>
   <context>
@@ -3389,37 +3390,37 @@ Output:
     <message>
       <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="34"/>
       <source>Set timezone to %1/%2</source>
-      <translation type="unfinished"/>
+      <translation>Meti il fûs orari su %1/%2</translation>
     </message>
     <message>
       <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="62"/>
       <source>Cannot access selected timezone path.</source>
-      <translation type="unfinished"/>
+      <translation>Impussibil acedi al percors dal fûs orari selezionât.</translation>
     </message>
     <message>
       <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="63"/>
       <source>Bad path: %1</source>
-      <translation type="unfinished"/>
+      <translation>Percors no valit: %1</translation>
     </message>
     <message>
       <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="71"/>
       <source>Cannot set timezone.</source>
-      <translation type="unfinished"/>
+      <translation>Impussibil stabilî il fûs orari.</translation>
     </message>
     <message>
       <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="72"/>
       <source>Link creation failed, target: %1; link name: %2</source>
-      <translation type="unfinished"/>
+      <translation>Creazion dal colegament falide, destinazion: %1; non colegament: %2</translation>
     </message>
     <message>
       <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="77"/>
       <source>Cannot set timezone,</source>
-      <translation type="unfinished"/>
+      <translation>Impussibil stabilî il fûs orari,</translation>
     </message>
     <message>
       <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="78"/>
       <source>Cannot open /etc/timezone for writing</source>
-      <translation type="unfinished"/>
+      <translation>Impussibil vierzi /etc/timezone pe scriture</translation>
     </message>
   </context>
   <context>
@@ -3427,7 +3428,7 @@ Output:
     <message>
       <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="41"/>
       <source>Shell Processes Job</source>
-      <translation type="unfinished"/>
+      <translation>Operazion dai procès de shell</translation>
     </message>
   </context>
   <context>
@@ -3436,7 +3437,7 @@ Output:
       <location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="27"/>
       <source>%L1 / %L2</source>
       <extracomment>slide counter, %1 of %2 (numeric)</extracomment>
-      <translation type="unfinished"/>
+      <translation>%L1 / %L2</translation>
     </message>
   </context>
   <context>
@@ -3444,12 +3445,12 @@ Output:
     <message>
       <location filename="../src/modules/summary/SummaryPage.cpp" line="47"/>
       <source>This is an overview of what will happen once you start the setup procedure.</source>
-      <translation type="unfinished"/>
+      <translation>Cheste e je une panoramiche di ce che al sucedarà une volte inviade la procedure di configurazion.</translation>
     </message>
     <message>
       <location filename="../src/modules/summary/SummaryPage.cpp" line="49"/>
       <source>This is an overview of what will happen once you start the install procedure.</source>
-      <translation type="unfinished"/>
+      <translation>Cheste e je une panoramiche di ce che al sucedarà une volte inviade la procedure di instalazion.</translation>
     </message>
   </context>
   <context>
@@ -3457,7 +3458,7 @@ Output:
     <message>
       <location filename="../src/modules/summary/SummaryViewStep.cpp" line="36"/>
       <source>Summary</source>
-      <translation type="unfinished"/>
+      <translation>Sintesi</translation>
     </message>
   </context>
   <context>
@@ -3465,22 +3466,22 @@ Output:
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="37"/>
       <source>Installation feedback</source>
-      <translation type="unfinished"/>
+      <translation>Opinion su la instalazion</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="43"/>
       <source>Sending installation feedback.</source>
-      <translation type="unfinished"/>
+      <translation>Daûr a inviâ la opinion su la instalazion.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="60"/>
       <source>Internal error in install-tracking.</source>
-      <translation type="unfinished"/>
+      <translation>Erôr interni in install-tracking.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="61"/>
       <source>HTTP request timed out.</source>
-      <translation type="unfinished"/>
+      <translation>Richieste HTTP scjadude.</translation>
     </message>
   </context>
   <context>
@@ -3488,28 +3489,28 @@ Output:
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="122"/>
       <source>KDE user feedback</source>
-      <translation type="unfinished"/>
+      <translation>Opinion dal utent di KDE</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="128"/>
       <source>Configuring KDE user feedback.</source>
-      <translation type="unfinished"/>
+      <translation>Daûr a configurâ la opinione dal utent di KDE.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="150"/>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="156"/>
       <source>Error in KDE user feedback configuration.</source>
-      <translation type="unfinished"/>
+      <translation>Erôr te configurazion de opinion dal utent di KDE.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="151"/>
       <source>Could not configure KDE user feedback correctly, script error %1.</source>
-      <translation type="unfinished"/>
+      <translation>Nol è stât pussibil configurâ in maniere juste la opinion dal utent di KDE, erôr di script %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="157"/>
       <source>Could not configure KDE user feedback correctly, Calamares error %1.</source>
-      <translation type="unfinished"/>
+      <translation>Nol è stât pussibil configurâ in maniere juste la opinion dal utent di KDE, erôr di Calamares %1.</translation>
     </message>
   </context>
   <context>
@@ -3517,28 +3518,28 @@ Output:
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="71"/>
       <source>Machine feedback</source>
-      <translation type="unfinished"/>
+      <translation>Opinion su la machine</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="77"/>
       <source>Configuring machine feedback.</source>
-      <translation type="unfinished"/>
+      <translation>Daûr a configurâ la opinion su la machine.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="100"/>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="106"/>
       <source>Error in machine feedback configuration.</source>
-      <translation type="unfinished"/>
+      <translation>Erôr inte configurazion de opinion su la machine.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="101"/>
       <source>Could not configure machine feedback correctly, script error %1.</source>
-      <translation type="unfinished"/>
+      <translation>Nol è stât pussibil configurâ in maniere juste la opinion su la machine, erôr di script %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="107"/>
       <source>Could not configure machine feedback correctly, Calamares error %1.</source>
-      <translation type="unfinished"/>
+      <translation>Nol è stât pussibil configurâ in maniere juste la opinion su la machine, erôr di Calamares %1.</translation>
     </message>
   </context>
   <context>
@@ -3551,37 +3552,37 @@ Output:
     <message>
       <location filename="../src/modules/tracking/page_trackingstep.ui" line="28"/>
       <source>Placeholder</source>
-      <translation type="unfinished"/>
+      <translation>Segnepuest</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/page_trackingstep.ui" line="76"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to send &lt;span style=" font-weight:600;"&gt;no information at all&lt;/span&gt; about your installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Fâs clic achì par &lt;span style=" font-weight:600;"&gt;no inviâ nissune informazion&lt;/span&gt; su la tô instalazion.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/page_trackingstep.ui" line="275"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href="placeholder"&gt;&lt;span style=" text-decoration: underline; color:#2980b9;"&gt;Click here for more information about user feedback&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href="placeholder"&gt;&lt;span style=" text-decoration: underline; color:#2980b9;"&gt;Fâs clic achì par vê plui informazions su lis opinions dai utents&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingPage.cpp" line="86"/>
       <source>Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area.</source>
-      <translation type="unfinished"/>
+      <translation>Tignî i indizis al jude %1 a viodi trop dispès che al ven instalât, in cuâl hardware e ce aplicazions che a vegnin dopradis. Par viodi ce che al ven inviât, fâs clic su pe icone di jutori dongje a ogni aree.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingPage.cpp" line="91"/>
       <source>By selecting this you will send information about your installation and hardware. This information will only be sent &lt;b&gt;once&lt;/b&gt; after the installation finishes.</source>
-      <translation type="unfinished"/>
+      <translation>Selezionant chest tu inviarâs informazions sul to hardware e su la tô instalazion. Cheste informazion e vignarà mandade dome &lt;b&gt;une volte&lt;/b&gt;, dopo finide la instalazion.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingPage.cpp" line="94"/>
       <source>By selecting this you will periodically send information about your &lt;b&gt;machine&lt;/b&gt; installation, hardware and applications, to %1.</source>
-      <translation type="unfinished"/>
+      <translation>Selezionant chest tu mandarâs informazions in mût periodic a %1 su la instalazion, l'hardware e lis aplicazions de tô &lt;b&gt;machine&lt;/b&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingPage.cpp" line="98"/>
       <source>By selecting this you will regularly send information about your &lt;b&gt;user&lt;/b&gt; installation, hardware, applications and application usage patterns, to %1.</source>
-      <translation type="unfinished"/>
+      <translation>Selezionant chest tu mandarâs cun regolaritât informazions a %1 su la instalazion, l'hardware, lis aplicazions e modei di ûs de aplicazion dal tô &lt;b&gt;utent&lt;/b&gt;.</translation>
     </message>
   </context>
   <context>
@@ -3589,7 +3590,7 @@ Output:
     <message>
       <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="49"/>
       <source>Feedback</source>
-      <translation type="unfinished"/>
+      <translation>Opinion</translation>
     </message>
   </context>
   <context>
@@ -3597,12 +3598,12 @@ Output:
     <message>
       <location filename="../src/modules/users/UsersPage.cpp" line="156"/>
       <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;small&gt;Se chest computer al vignarà doprât di plui di une persone, si pues creâ plui accounts dopo vê completade la configurazion.&lt;/small&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/users/UsersPage.cpp" line="162"/>
       <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;small&gt;Se chest computer al vignarà doprât di plui di une persone, si pues creâ plui accounts dopo vê completade la instalazion.&lt;/small&gt;</translation>
     </message>
   </context>
   <context>
@@ -3610,7 +3611,7 @@ Output:
     <message>
       <location filename="../src/modules/usersq/UsersQmlViewStep.cpp" line="39"/>
       <source>Users</source>
-      <translation type="unfinished"/>
+      <translation>Utents</translation>
     </message>
   </context>
   <context>
@@ -3618,7 +3619,7 @@ Output:
     <message>
       <location filename="../src/modules/users/UsersViewStep.cpp" line="48"/>
       <source>Users</source>
-      <translation type="unfinished"/>
+      <translation>Utents</translation>
     </message>
   </context>
   <context>
@@ -3627,13 +3628,13 @@ Output:
       <location filename="../src/calamares/VariantModel.cpp" line="232"/>
       <source>Key</source>
       <comment>Column header for key/value</comment>
-      <translation type="unfinished"/>
+      <translation>Clâf</translation>
     </message>
     <message>
       <location filename="../src/calamares/VariantModel.cpp" line="236"/>
       <source>Value</source>
       <comment>Column header for key/value</comment>
-      <translation type="unfinished"/>
+      <translation>Valôr</translation>
     </message>
   </context>
   <context>
@@ -3646,22 +3647,22 @@ Output:
     <message>
       <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="24"/>
       <source>List of Physical Volumes</source>
-      <translation type="unfinished"/>
+      <translation>Liste di volums fisics</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="34"/>
       <source>Volume Group Name:</source>
-      <translation type="unfinished"/>
+      <translation>Non dal grup di volums:</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="47"/>
       <source>Volume Group Type:</source>
-      <translation type="unfinished"/>
+      <translation>Gjenar dal grup di volums:</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="60"/>
       <source>Physical Extent Size:</source>
-      <translation type="unfinished"/>
+      <translation>Dimension de estension fisiche:</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="70"/>
@@ -3671,22 +3672,22 @@ Output:
     <message>
       <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="86"/>
       <source>Total Size:</source>
-      <translation type="unfinished"/>
+      <translation>Dimension totâl:</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="106"/>
       <source>Used Size:</source>
-      <translation type="unfinished"/>
+      <translation>Dimension doprade:</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="126"/>
       <source>Total Sectors:</source>
-      <translation type="unfinished"/>
+      <translation>Setôrs totâi:</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="146"/>
       <source>Quantity of LVs:</source>
-      <translation type="unfinished"/>
+      <translation>Cuantitât di VLs:</translation>
     </message>
   </context>
   <context>
@@ -3700,92 +3701,92 @@ Output:
       <location filename="../src/modules/welcome/WelcomePage.ui" line="79"/>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="98"/>
       <source>Select application and system language</source>
-      <translation type="unfinished"/>
+      <translation>Selezionâ lenghe di sisteme e di aplicazions</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
       <source>&amp;About</source>
-      <translation type="unfinished"/>
+      <translation>&amp;Informazions</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
       <source>Open donations website</source>
-      <translation type="unfinished"/>
+      <translation>Vierç il sît web pes donazions</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
       <source>&amp;Donate</source>
-      <translation type="unfinished"/>
+      <translation>&amp;Done</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
       <source>Open help and support website</source>
-      <translation type="unfinished"/>
+      <translation>Vierç il sît web pal jutori e pal supuart</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
       <source>&amp;Support</source>
-      <translation type="unfinished"/>
+      <translation>&amp;Supuart</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
       <source>Open issues and bug-tracking website</source>
-      <translation type="unfinished"/>
+      <translation>Vierç il sît web sui problemis e lis segnalazions/indizis sui erôrs</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
       <source>&amp;Known issues</source>
-      <translation type="unfinished"/>
+      <translation>&amp;Problemis cognossûts</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
       <source>Open release notes website</source>
-      <translation type="unfinished"/>
+      <translation>Vierç il sît web des notis di publicazion</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
       <source>&amp;Release notes</source>
-      <translation type="unfinished"/>
+      <translation>&amp;Notis di publicazion</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
       <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Benvignûts sul program di configurazion Calamares par %1.&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="217"/>
       <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Benvignûts te configurazion di %1.&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="222"/>
       <source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Benvignûts sul program di instalazion Calamares par %1.&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
       <source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Benvignûts sul program di instalazion di %1.&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="228"/>
       <source>%1 support</source>
-      <translation type="unfinished"/>
+      <translation>Supuart di %1</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="235"/>
       <source>About %1 setup</source>
-      <translation type="unfinished"/>
+      <translation>Informazions su la configurazion di %1</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="235"/>
       <source>About %1 installer</source>
-      <translation type="unfinished"/>
+      <translation>Informazion su la instalazion di %1</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="238"/>
       <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;par %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Gracie a &lt;a href="https://calamares.io/team/"&gt;il grup di Calamares&lt;/a&gt; e al &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;grup di tradutôrs di Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;Il disvilup di &lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; al è patrocinât di &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
     </message>
   </context>
   <context>
@@ -3793,7 +3794,7 @@ Output:
     <message>
       <location filename="../src/modules/welcomeq/WelcomeQmlViewStep.cpp" line="41"/>
       <source>Welcome</source>
-      <translation type="unfinished"/>
+      <translation>Benvignûts</translation>
     </message>
   </context>
   <context>
@@ -3801,7 +3802,7 @@ Output:
     <message>
       <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="48"/>
       <source>Welcome</source>
-      <translation type="unfinished"/>
+      <translation>Benvignûts</translation>
     </message>
   </context>
   <context>
@@ -3820,12 +3821,23 @@ Output:
                         development is sponsored by &lt;br/&gt;
                         &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
                         Liberating Software.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
+                        &lt;strong&gt;%2&lt;br/&gt;
+                        par %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
+                        Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;
+                        Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;
+                        Gracie a &lt;a href='https://calamares.io/team/'&gt;il grup di Calamares&lt;/a&gt;
+                        e al &lt;a href='https://www.transifex.com/calamares/calamares/'&gt;grup di tradutôrs
+                        di Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;
+                        Il disvilup di
+                        &lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt; al è patrocinât di &lt;br/&gt;
+                        &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
+                        Liberating Software.</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/about.qml" line="96"/>
       <source>Back</source>
-      <translation type="unfinished"/>
+      <translation>Indaûr</translation>
     </message>
   </context>
   <context>
@@ -3834,18 +3846,20 @@ Output:
       <location filename="../src/modules/localeq/i18n.qml" line="46"/>
       <source>&lt;h1&gt;Languages&lt;/h1&gt; &lt;/br&gt;
                     The system locale setting affects the language and character set for some command line user interface elements. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Lenghis&lt;/h1&gt; &lt;/br&gt;
+                    La impostazion di localizazion dal sisteme e influence la lenghe e la cumbinazion di caratars par cualchi element de interface utent a rie di comant. La impostazion atuâl e je &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/i18n.qml" line="106"/>
       <source>&lt;h1&gt;Locales&lt;/h1&gt; &lt;/br&gt;
                     The system locale setting affects the numbers and dates format. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Localitâts&lt;/h1&gt; &lt;/br&gt;
+                    La impostazions di localizazion dal sisteme e influence il formât des datis e dai numars. La impostazion atuâl e je &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/i18n.qml" line="158"/>
       <source>Back</source>
-      <translation type="unfinished"/>
+      <translation>Indaûr</translation>
     </message>
   </context>
   <context>
@@ -3853,42 +3867,42 @@ Output:
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="45"/>
       <source>Keyboard Model</source>
-      <translation type="unfinished"/>
+      <translation>Model di tastiere</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="377"/>
       <source>Layouts</source>
-      <translation type="unfinished"/>
+      <translation>Disposizions</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="148"/>
       <source>Keyboard Layout</source>
-      <translation type="unfinished"/>
+      <translation>Disposizion di tastiere</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
       <source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
-      <translation type="unfinished"/>
+      <translation>Fâs clic sul model di tastiere preferît par selezionâ la disposizion e la variante, o dopre chel predefinît basât sul hardware rilevât.</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
       <source>Models</source>
-      <translation type="unfinished"/>
+      <translation>Modei</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="260"/>
       <source>Variants</source>
-      <translation type="unfinished"/>
+      <translation>Variantis</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
       <source>Keyboard Variant</source>
-      <translation type="unfinished"/>
+      <translation>Variante di tastiere</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
       <source>Test your keyboard</source>
-      <translation type="unfinished"/>
+      <translation>Prove la tastiere</translation>
     </message>
   </context>
   <context>
@@ -3896,7 +3910,7 @@ Output:
     <message>
       <location filename="../src/modules/localeq/localeq.qml" line="81"/>
       <source>Change</source>
-      <translation type="unfinished"/>
+      <translation>Cambie</translation>
     </message>
   </context>
   <context>
@@ -3905,7 +3919,8 @@ Output:
       <location filename="../src/modules/notesqml/notesqml.qml" line="50"/>
       <source>&lt;h3&gt;%1&lt;/h3&gt;
             &lt;p&gt;These are example release notes.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h3&gt;%1&lt;/h3&gt;
+            &lt;p&gt;Chescj a son esemplis di notis di publicazion.&lt;/p&gt;</translation>
     </message>
   </context>
   <context>
@@ -3933,12 +3948,32 @@ Output:
             &lt;/ul&gt;
 
             &lt;p&gt;The vertical scrollbar is adjustable, current width set to 10.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h3&gt;%1&lt;/h3&gt;
+            &lt;p&gt;Chest esempli di file QML, al mostre lis opzions in test formatât cun contignût che si pues dai une passade.&lt;/p&gt;
+
+            &lt;p&gt;Il QML cun test formatât al pues doprâ etichetis HTML, il contignût che si pues scori al è util pai touchscreens.&lt;/p&gt;
+
+            &lt;p&gt;&lt;b&gt;Chest al è test in neret&lt;/b&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;i&gt;Chest al è test corsîf&lt;/i&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;u&gt;Chest al è test sotlineât&lt;/u&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;center&gt;Chest test al vignarà centrât.&lt;/center&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;s&gt;Chest al è stricât&lt;/s&gt;&lt;/p&gt;
+
+            &lt;p&gt;Esempli di codiç:
+            &lt;code&gt;ls -l /home&lt;/code&gt;&lt;/p&gt;
+
+            &lt;p&gt;&lt;b&gt;Listis:&lt;/b&gt;&lt;/p&gt;
+            &lt;ul&gt;
+                &lt;li&gt;Sistemis a CPU Intel&lt;/li&gt;
+                &lt;li&gt;Sistemis a CPU AMD&lt;/li&gt;
+            &lt;/ul&gt;
+
+            &lt;p&gt;La sbare di scoriment verticâl si pues justâ, cumò la largjece e je metude a 10.&lt;/p&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/release_notes.qml" line="76"/>
       <source>Back</source>
-      <translation type="unfinished"/>
+      <translation>Indaûr</translation>
     </message>
   </context>
   <context>
@@ -3946,7 +3981,7 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="36"/>
       <source>Pick your user name and credentials to login and perform admin tasks</source>
-      <translation type="unfinished"/>
+      <translation>Sielç e dopre il to non utent e lis credenziâls par jentrâ e eseguî ativitâts di aministradôr</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@@ -3966,12 +4001,12 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="87"/>
       <source>Login Name</source>
-      <translation type="unfinished"/>
+      <translation>Non di acès</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="103"/>
       <source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
-      <translation type="unfinished"/>
+      <translation>Se chest computer al vignarà doprât di plui personis, tu puedis creâ plui account dopo vê completade la instalazion.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="118"/>
@@ -3986,7 +4021,7 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="140"/>
       <source>This name will be used if you make the computer visible to others on a network.</source>
-      <translation type="unfinished"/>
+      <translation>Si doprarà chest non se tu rindis visibil a altris chest computer suntune rêt.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@@ -4006,12 +4041,12 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="204"/>
       <source>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.</source>
-      <translation type="unfinished"/>
+      <translation>Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure. Une buine password e contignarà un miscliç di letaris, numars e puntuazions, e sarà lungje almancul vot caratars e si scugnarà cambiâle a intervai regolârs.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="216"/>
       <source>Validate passwords quality</source>
-      <translation type="unfinished"/>
+      <translation>Convalidâ la cualitât des passwords</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="226"/>
@@ -4021,12 +4056,12 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="234"/>
       <source>Log in automatically without asking for the password</source>
-      <translation type="unfinished"/>
+      <translation>Jentre in automatic cence domandâ la password</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="243"/>
       <source>Reuse user password as root password</source>
-      <translation type="unfinished"/>
+      <translation>Torne dopre la password dal utent pe password di root</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@@ -4036,22 +4071,22 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="268"/>
       <source>Choose a root password to keep your account safe.</source>
-      <translation type="unfinished"/>
+      <translation>Sielç une password di root par tignî il to account al sigûr.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="279"/>
       <source>Root Password</source>
-      <translation type="unfinished"/>
+      <translation>Password di root</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="298"/>
       <source>Repeat Root Password</source>
-      <translation type="unfinished"/>
+      <translation>Ripeti password di root</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="318"/>
       <source>Enter the same password twice, so that it can be checked for typing errors.</source>
-      <translation type="unfinished"/>
+      <translation>Inserìs la stesse password dôs voltis, in mût di evitâ erôrs di batidure.</translation>
     </message>
   </context>
   <context>
@@ -4060,32 +4095,33 @@ Output:
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="35"/>
       <source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;
             &lt;p&gt;This program will ask you some questions and set up %1 on your computer.&lt;/p&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h3&gt;Benvignûts sul program di instalazion &lt;quote&gt;%2&lt;/quote&gt; par %1&lt;/h3&gt;
+            &lt;p&gt;Chest program al fasarà cualchi domande e al configurarà %1 sul to computer.&lt;/p&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
       <source>About</source>
-      <translation type="unfinished"/>
+      <translation>Informazions</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
       <source>Support</source>
-      <translation type="unfinished"/>
+      <translation>Supuart</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
       <source>Known issues</source>
-      <translation type="unfinished"/>
+      <translation>Problemis cognossûts</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
       <source>Release notes</source>
-      <translation type="unfinished"/>
+      <translation>Notis di publicazion</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
       <source>Donate</source>
-      <translation type="unfinished"/>
+      <translation>Done</translation>
     </message>
   </context>
 </TS>
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index 6c7ea88d8..e87f6bb19 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -11,12 +11,12 @@
     <message>
       <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/>
       <source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source>
-      <translation>מערכת זו הופעלה בתצורת אתחול &lt;strong&gt;EFI&lt;/strong&gt;.&lt;br&gt;&lt;br&gt; כדי להגדיר הפעלה מתצורת אתחול EFI, על אשף ההתקנה להתקין מנהל אתחול מערכת, לדוגמה &lt;strong&gt;GRUB&lt;/strong&gt; או &lt;strong&gt;systemd-boot&lt;/strong&gt; על &lt;strong&gt;מחיצת מערכת EFI&lt;/strong&gt;. פעולה זו היא אוטומטית, אלא אם כן העדפתך היא להגדיר מחיצות באופן ידני, במקרה זה עליך לבחור זאת או להגדיר בעצמך.</translation>
+      <translation>מערכת זו הופעלה בתצורת אתחול &lt;strong&gt;EFI&lt;/strong&gt;.&lt;br&gt;&lt;br&gt; כדי להגדיר הפעלה מתצורת אתחול EFI, על תכנית ההתקנה להתקין מנהל אתחול מערכת, לדוגמה &lt;strong&gt;GRUB&lt;/strong&gt; או &lt;strong&gt;systemd-boot&lt;/strong&gt; על &lt;strong&gt;מחיצת מערכת EFI&lt;/strong&gt;. פעולה זו היא אוטומטית, אלא אם כן העדפתך היא להגדיר מחיצות באופן ידני, במקרה זה יש לבחור זאת או להגדיר בעצמך.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="83"/>
       <source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source>
-      <translation>מערכת זו הופעלה בתצורת אתחול &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;&lt;br&gt; כדי להגדיר הפעלה מתצורת אתחול BIOS, על אשף ההתקנה להתקין מנהל אתחול מערכת, לדוגמה &lt;strong&gt;GRUB&lt;/strong&gt;, בתחילת המחיצה או על ה־&lt;strong&gt;Master Boot Record&lt;/strong&gt; בצמוד להתחלה של טבלת המחיצות (מועדף). פעולה זו היא אוטומטית, אלא אם כן תבחר להגדיר מחיצות באופן ידני, במקרה זה עליך להגדיר זאת בעצמך.</translation>
+      <translation>מערכת זו הופעלה בתצורת אתחול &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;&lt;br&gt; כדי להגדיר הפעלה מתצורת אתחול BIOS, על תכנית ההתקנה להתקין מנהל אתחול מערכת, לדוגמה &lt;strong&gt;GRUB&lt;/strong&gt;, בתחילת המחיצה או על ה־&lt;strong&gt;Master Boot Record&lt;/strong&gt; בצמוד להתחלה של טבלת המחיצות (מועדף). פעולה זו היא אוטומטית, אלא אם כן תבחר להגדיר מחיצות באופן ידני, במקרה זה יש להגדיר זאת בעצמך.</translation>
     </message>
   </context>
   <context>
@@ -340,7 +340,7 @@
     <message>
       <location filename="../src/libcalamaresui/ViewManager.cpp" line="332"/>
       <source>The %1 installer is about to make changes to your disk in order to install %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
-      <translation>אשף ההתקנה של %1 הולך לבצע שינויים בכונן שלך לטובת התקנת %2.&lt;br/&gt;&lt;strong&gt;לא תוכל לבטל את השינויים הללו.&lt;/strong&gt;</translation>
+      <translation>תכנית ההתקנה של %1 עומדת לבצע שינויים בכונן שלך לטובת התקנת %2.&lt;br/&gt;&lt;strong&gt;לא תהיה אפשרות לבטל את השינויים הללו.&lt;/strong&gt;</translation>
     </message>
     <message>
       <location filename="../src/libcalamaresui/ViewManager.cpp" line="335"/>
@@ -375,7 +375,7 @@
     <message>
       <location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/>
       <source>The installation is complete. Close the installer.</source>
-      <translation>תהליך ההתקנה הושלם. נא לסגור את אשף ההתקנה.</translation>
+      <translation>תהליך ההתקנה הושלם. נא לסגור את תכנית ההתקנה.</translation>
     </message>
     <message>
       <location filename="../src/libcalamaresui/ViewManager.cpp" line="397"/>
@@ -428,8 +428,8 @@ The setup program will quit and all changes will be lost.</source>
       <location filename="../src/libcalamaresui/ViewManager.cpp" line="514"/>
       <source>Do you really want to cancel the current install process?
 The installer will quit and all changes will be lost.</source>
-      <translation>האם ברצונך לבטל את תהליך ההתקנה?
-אשף ההתקנה ייסגר וכל השינויים יאבדו.</translation>
+      <translation>האם אכן ברצונך לבטל את תהליך ההתקנה?
+תכנית ההתקנה תיסגר וכל השינויים יאבדו.</translation>
     </message>
   </context>
   <context>
@@ -495,7 +495,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/calamares/CalamaresWindow.cpp" line="305"/>
       <source>%1 Installer</source>
-      <translation>אשף התקנה של %1</translation>
+      <translation>תכנית התקנת %1</translation>
     </message>
   </context>
   <context>
@@ -638,7 +638,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
       <source>No Swap</source>
-      <translation>בלי החלפה</translation>
+      <translation>ללא החלפה</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1611"/>
@@ -1117,7 +1117,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="56"/>
       <source>The installer failed to delete partition %1.</source>
-      <translation>אשף ההתקנה נכשל בעת מחיקת מחיצה %1.</translation>
+      <translation>תכנית ההתקנה כשלה במחיקת המחיצה %1.</translation>
     </message>
   </context>
   <context>
@@ -1644,7 +1644,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
       <source>If you do not agree with the terms, the setup procedure cannot continue.</source>
-      <translation>אם התנאים האלה אינם מקובלים עליך, אי אפשר להמשיך בתהליך ההתקנה.</translation>
+      <translation>אם התנאים האלה אינם מקובלים עליכם, אי אפשר להמשיך בתהליך ההתקנה.</translation>
     </message>
     <message>
       <location filename="../src/modules/license/LicensePage.cpp" line="151"/>
@@ -1654,7 +1654,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/license/LicensePage.cpp" line="156"/>
       <source>If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.</source>
-      <translation>אם תנאים אלו אינם מקובלים עליך, לא תותקן תכנה קניינית וייעשה שימוש בחלופות בקוד פתוח במקום.</translation>
+      <translation>אם התנאים הללו אינם מקובלים עליכם, תוכנה קניינית לא תותקן, ובמקומן יעשה שימוש בחלופות בקוד פתוח.</translation>
     </message>
   </context>
   <context>
@@ -1826,8 +1826,8 @@ The installer will quit and all changes will be lost.</source>
       <source>Please select your preferred location on the map so the installer can suggest the locale
             and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging
             to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.</source>
-      <translation>נא לבחור את המיקום המועדף עליך על המפה כדי שתכנית ההתקנה תוכל להציע הגדרות מקומיות
-             ואזור זמן עבורך. ניתן לכוונן את ההגדרות המוצעות להלן. לחפש במפה על ידי משיכה להזזתה ובכפתורים +/- כדי להתקרב/להתרחק
+      <translation>נא לבחור את המיקום המועדף עליכם על המפה כדי שתכנית ההתקנה תוכל להציע הגדרות מקומיות
+             ואזור זמן עבורכם. ניתן לכוונן את ההגדרות המוצעות להלן. לחפש במפה על ידי משיכה להזזתה ובכפתורים +/- כדי להתקרב/להתרחק
             או להשתמש בגלילת העכבר לטובת שליטה בתקריב.</translation>
     </message>
   </context>
@@ -1974,7 +1974,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="37"/>
       <source>Select your preferred Region, or use the default one based on your current location.</source>
-      <translation>נא לבחור את המחוז המועדף עליך או להשתמש בבררת המחדל לפי המיקום הנוכחי שלך.</translation>
+      <translation>נא לבחור את המחוז המועדף עליכם או להשתמש בברירת המחדל לפי המיקום הנוכחי שלכם.</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="94"/>
@@ -2029,7 +2029,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="158"/>
       <source>The password is the same as the old one</source>
-      <translation>הססמה זהה לישנה</translation>
+      <translation>הססמה הזו זהה לישנה</translation>
     </message>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="160"/>
@@ -2413,7 +2413,7 @@ The installer will quit and all changes will be lost.</source>
       <location filename="../src/modules/users/page_usersetup.ui" line="519"/>
       <location filename="../src/modules/users/page_usersetup.ui" line="544"/>
       <source>&lt;small&gt;Enter the same password twice, so that it can be checked for typing errors.&lt;/small&gt;</source>
-      <translation>&lt;small&gt;עליך להקליד את אותה הססמה פעמיים כדי לאפשר זיהוי של שגיאות הקלדה.&lt;/small&gt;</translation>
+      <translation>&lt;small&gt;יש להקליד את אותה הססמה פעמיים כדי לאפשר זיהוי של שגיאות הקלדה.&lt;/small&gt;</translation>
     </message>
   </context>
   <context>
@@ -2648,12 +2648,12 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="427"/>
       <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;%3&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</source>
-      <translation>מחיצת מערכת EFI נדרשת כדי להפעיל את %1.&lt;br/&gt;&lt;br/&gt; כדי להגדיר מחיצת מערכת EFI, עליך לחזור ולבחור או ליצור מערכת קבצים מסוג FAT32 עם סימון &lt;strong&gt;%3&lt;/strong&gt; פעיל ועם נקודת עיגון &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt; ניתן להמשיך ללא הגדרת מחיצת מערכת EFI אך טעינת המערכת עשויה להיכשל.</translation>
+      <translation>מחיצת מערכת EFI נדרשת כדי להפעיל את %1.&lt;br/&gt;&lt;br/&gt; כדי להגדיר מחיצת מערכת EFI, יש לחזור ולבחור או ליצור מערכת קבצים מסוג FAT32 עם סימון &lt;strong&gt;%3&lt;/strong&gt; פעיל ועם נקודת עיגון &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt; ניתן להמשיך ללא הגדרת מחיצת מערכת EFI אך טעינת המערכת עשויה להיכשל.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="441"/>
       <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;%3&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</source>
-      <translation>לצורך הפעלת %1 נדרשת מחיצת מערכת EFI.&lt;br/&gt;&lt;br/&gt; הוגדרה מחיצה עם נקודת עיגון &lt;strong&gt;%2&lt;/strong&gt; אך לא הוגדר סימון &lt;strong&gt;%3&lt;/strong&gt;.&lt;br/&gt; כדי לסמן את המחיצה, עליך לחזור ולערוך את המחיצה.&lt;br/&gt;&lt;br/&gt; ניתן להמשיך ללא הוספת הסימון אך טעינת המערכת עשויה להיכשל.</translation>
+      <translation>לצורך הפעלת %1 נדרשת מחיצת מערכת EFI.&lt;br/&gt;&lt;br/&gt; הוגדרה מחיצה עם נקודת עיגון &lt;strong&gt;%2&lt;/strong&gt; אך לא הוגדר סימון &lt;strong&gt;%3&lt;/strong&gt;.&lt;br/&gt; כדי לסמן את המחיצה, יש לחזור ולערוך את המחיצה.&lt;br/&gt;&lt;br/&gt; ניתן להמשיך ללא הוספת הסימון אך טעינת המערכת עשויה להיכשל.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="440"/>
@@ -2843,7 +2843,7 @@ Output:
     <message>
       <location filename="../src/libcalamares/partition/FileSystem.cpp" line="34"/>
       <source>swap</source>
-      <translation>דפדוף, swap</translation>
+      <translation>דפדוף swap</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="90"/>
@@ -3886,7 +3886,7 @@ Output:
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
       <source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
-      <translation>נא ללחוץ על דרם המקלדת המועדף עליך כדי לבחור בפריסה ובהגוון או להשתמש בבררת המחדל בהתאם לחומרה שזוהתה.</translation>
+      <translation>נא ללחוץ על דגם המקלדת המועדף עליכם כדי לבחור בפריסה ובהגוון או להשתמש בברירת המחדל בהתאם לחומרה שזוהתה.</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
diff --git a/lang/calamares_hi.ts b/lang/calamares_hi.ts
index 1f220d9e5..f6d73519d 100644
--- a/lang/calamares_hi.ts
+++ b/lang/calamares_hi.ts
@@ -619,17 +619,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>इस संचय उपकरण पर पहले से ऑपरेटिंग सिस्टम है, परंतु &lt;strong&gt;%1&lt;/strong&gt; विभाजन तालिका अपेक्षित &lt;strong&gt;%2&lt;/strong&gt; से भिन्न है।&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>इस संचय उपकरण के विभाजनों में से कोई एक विभाजन &lt;strong&gt;माउंट&lt;/strong&gt; है।</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>यह संचय उपकरण एक &lt;strong&gt;निष्क्रिय RAID&lt;/strong&gt; उपकरण का हिस्सा है।</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index e9e5c252a..256de9da6 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -621,7 +621,7 @@ Instalacijski program će izaći i sve promjene će biti izgubljene.</translatio
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Ovaj uređaj za pohranu već ima operativni sustav, ali njegova particijska tablica &lt;strong&gt;%1&lt;/strong&gt; razlikuje se od potrebne &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
diff --git a/lang/calamares_ja.ts b/lang/calamares_ja.ts
index 0a798b844..3a820770f 100644
--- a/lang/calamares_ja.ts
+++ b/lang/calamares_ja.ts
@@ -617,7 +617,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>このストレージデバイスにはすでにオペレーティングシステムがインストールされていますが、パーティションテーブル &lt;strong&gt;%1&lt;/strong&gt; は必要な &lt;strong&gt;%2&lt;/strong&gt; とは異なります。&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index 242303308..9897c6c1a 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -619,17 +619,17 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>O dispositivo de armazenamento já possui um sistema operacional, mas a tabela de partições &lt;strong&gt;%1&lt;/strong&gt; é diferente da necessária &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>O dispositivo de armazenamento tem uma de suas partições &lt;strong&gt;montada&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>O dispositivo de armazenamento é parte de um dispositivo &lt;strong&gt;RAID inativo&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
diff --git a/lang/calamares_sv.ts b/lang/calamares_sv.ts
index 3f03caf4e..ec72fefa9 100644
--- a/lang/calamares_sv.ts
+++ b/lang/calamares_sv.ts
@@ -618,17 +618,17 @@ Alla ändringar kommer att gå förlorade.</translation>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Denna lagringsenhet har redan ett operativsystem installerat på sig, men partitionstabellen &lt;strong&gt;%1&lt;/strong&gt; skiljer sig från den som behövs &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Denna lagringsenhet har en av dess partitioner &lt;strong&gt;monterad&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Denna lagringsenhet är en del av en &lt;strong&gt;inaktiv RAID&lt;/strong&gt;enhet.    </translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
diff --git a/lang/calamares_tg.ts b/lang/calamares_tg.ts
index eac2d747e..9c2910547 100644
--- a/lang/calamares_tg.ts
+++ b/lang/calamares_tg.ts
@@ -620,17 +620,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Ин дастгоҳи захирагоҳ аллакай дорои низоми амалкунанда мебошад, аммо ҷадвали қисми диски &lt;strong&gt;%1&lt;/strong&gt; аз диски лозимии &lt;strong&gt;%2&lt;/strong&gt; фарқ мекунад.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Яке аз қисмҳои диски ин дастгоҳи захирагоҳ &lt;strong&gt;васлшуда&lt;/strong&gt; мебошад.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Ин дастгоҳи захирагоҳ қисми дасгоҳи &lt;strong&gt;RAID-и ғайрифаъол&lt;/strong&gt; мебошад.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
diff --git a/lang/calamares_vi.ts b/lang/calamares_vi.ts
new file mode 100644
index 000000000..140da8aad
--- /dev/null
+++ b/lang/calamares_vi.ts
@@ -0,0 +1,4124 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS language="vi" version="2.1">
+  <context>
+    <name>BootInfoWidget</name>
+    <message>
+      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="61"/>
+      <source>The &lt;strong&gt;boot environment&lt;/strong&gt; of this system.&lt;br&gt;&lt;br&gt;Older x86 systems only support &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Modern systems usually use &lt;strong&gt;EFI&lt;/strong&gt;, but may also show up as BIOS if started in compatibility mode.</source>
+      <translation>&lt;strong&gt; Môi trường khởi động &lt;/strong&gt; của hệ thống này. &lt;br&gt; &lt;br&gt; Các hệ thống x86 cũ hơn chỉ hỗ trợ &lt;strong&gt; BIOS &lt;/strong&gt;. &lt;br&gt; Các hệ thống hiện đại thường sử dụng &lt;strong&gt; EFI &lt;/strong&gt;, nhưng cũng có thể hiển thị dưới dạng BIOS nếu được khởi động ở chế độ tương thích.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/>
+      <source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source>
+      <translation>Hệ thống này được khởi động bằng môi trường khởi động &lt;strong&gt; EFI &lt;/strong&gt;. &lt;br&gt; &lt;br&gt; Để định cấu hình khởi động từ môi trường EFI, trình cài đặt này phải triển khai ứng dụng trình tải khởi động, như &lt;strong&gt; GRUB &lt;/strong&gt; hoặc &lt;strong&gt; systemd-boot &lt;/strong&gt; trên &lt;strong&gt; Phân vùng hệ thống EFI &lt;/strong&gt;. Điều này là tự động, trừ khi bạn chọn phân vùng thủ công, trong trường hợp này, bạn phải chọn nó hoặc tự tạo nó.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="83"/>
+      <source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source>
+      <translation>Hệ thống này được khởi động với môi trường khởi động &lt;strong&gt; BIOS &lt;/strong&gt;. &lt;br&gt; &lt;br&gt; Để định cấu hình khởi động từ môi trường BIOS, trình cài đặt này phải cài đặt một trình tải khởi động, chẳng hạn như &lt;strong&gt; GRUB &lt;/strong&gt; ở đầu phân vùng hoặc trên &lt;strong&gt; Bản ghi khởi động chính &lt;/strong&gt; gần đầu bảng phân vùng (ưu tiên). Điều này là tự động, trừ khi bạn chọn phân vùng thủ công, trong trường hợp đó, bạn phải tự thiết lập nó.</translation>
+    </message>
+  </context>
+  <context>
+    <name>BootLoaderModel</name>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="58"/>
+      <source>Master Boot Record of %1</source>
+      <translation>Bản ghi khởi động chính của %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="91"/>
+      <source>Boot Partition</source>
+      <translation>Phân vùng khởi động</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="98"/>
+      <source>System Partition</source>
+      <translation>Phân vùng hệ thống</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="128"/>
+      <source>Do not install a boot loader</source>
+      <translation>Không cài đặt bộ tải khởi động</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="146"/>
+      <source>%1 (%2)</source>
+      <translation>%1 (%2)</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::BlankViewStep</name>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/BlankViewStep.cpp" line="61"/>
+      <source>Blank Page</source>
+      <translation>Trang trắng</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::DebugWindow</name>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="18"/>
+      <source>Form</source>
+      <translation>Mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="28"/>
+      <source>GlobalStorage</source>
+      <translation>Lưu trữ tổng quát</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="38"/>
+      <source>JobQueue</source>
+      <translation>Hàng đợi công việc</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="48"/>
+      <source>Modules</source>
+      <translation>Mô-đun</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="61"/>
+      <source>Type:</source>
+      <translation>Kiểu:</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="68"/>
+      <location filename="../src/calamares/DebugWindow.ui" line="82"/>
+      <source>none</source>
+      <translation>không</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="75"/>
+      <source>Interface:</source>
+      <translation>Giao diện:</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="97"/>
+      <source>Tools</source>
+      <translation>Công cụ</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="110"/>
+      <source>Reload Stylesheet</source>
+      <translation>Tải lại bảng định kiểu</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.ui" line="117"/>
+      <source>Widget Tree</source>
+      <translation>Cây công cụ</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/DebugWindow.cpp" line="217"/>
+      <source>Debug information</source>
+      <translation>Thông tin gỡ lỗi</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::ExecutionViewStep</name>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="85"/>
+      <source>Set up</source>
+      <translation>Thiết lập</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/ExecutionViewStep.cpp" line="85"/>
+      <source>Install</source>
+      <translation>Cài đặt</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::FailJob</name>
+    <message>
+      <location filename="../src/libcalamares/JobExample.cpp" line="29"/>
+      <source>Job failed (%1)</source>
+      <translation>Công việc thất bại (%1)</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/JobExample.cpp" line="30"/>
+      <source>Programmed job failure was explicitly requested.</source>
+      <translation>Lỗi công việc được lập trình đã được yêu cầu rõ ràng.</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::JobThread</name>
+    <message>
+      <location filename="../src/libcalamares/JobQueue.cpp" line="196"/>
+      <source>Done</source>
+      <translation>Xong</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::NamedJob</name>
+    <message>
+      <location filename="../src/libcalamares/JobExample.cpp" line="17"/>
+      <source>Example job (%1)</source>
+      <translation>Ví dụ về công việc (%1)</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::ProcessJob</name>
+    <message>
+      <location filename="../src/libcalamares/ProcessJob.cpp" line="43"/>
+      <source>Run command '%1' in target system.</source>
+      <translation>Chạy lệnh '%1' trong hệ thống đích.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/ProcessJob.cpp" line="43"/>
+      <source> Run command '%1'.</source>
+      <translation> Chạy lệnh '%1'.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/ProcessJob.cpp" line="50"/>
+      <source>Running command %1 %2</source>
+      <translation>Đang chạy lệnh %1 %2</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::PythonJob</name>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="192"/>
+      <source>Running %1 operation.</source>
+      <translation>Đang chạy %1 thao tác.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="221"/>
+      <source>Bad working directory path</source>
+      <translation>Sai đường dẫn thư mục làm việc</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="222"/>
+      <source>Working directory %1 for python job %2 is not readable.</source>
+      <translation>Không thể đọc thư mục làm việc %1 của công việc python %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="228"/>
+      <source>Bad main script file</source>
+      <translation>Sai tệp kịch bản chính</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="229"/>
+      <source>Main script file %1 for python job %2 is not readable.</source>
+      <translation>Không thể đọc tập tin kịch bản chính %1 của công việc python %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonJob.cpp" line="297"/>
+      <source>Boost.Python error in job "%1".</source>
+      <translation>Lỗi Boost.Python trong công việc "%1".</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::QmlViewStep</name>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="67"/>
+      <source>Loading ...</source>
+      <translation>Đang tải ...</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="88"/>
+      <source>QML Step &lt;i&gt;%1&lt;/i&gt;.</source>
+      <translation>QML bước &lt;i&gt;%1&lt;/i&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/viewpages/QmlViewStep.cpp" line="268"/>
+      <source>Loading failed.</source>
+      <translation>Không tải được.</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::RequirementsChecker</name>
+    <message>
+      <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="94"/>
+      <source>Requirements checking for module &lt;i&gt;%1&lt;/i&gt; is complete.</source>
+      <translation>Kiểm tra các yêu cầu cho mô-đun &lt;i&gt; %1 &lt;/i&gt; đã hoàn tất.</translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="115"/>
+      <source>Waiting for %n module(s).</source>
+      <translation>
+        <numerusform>Đang đợi %n mô-đun.</numerusform>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="116"/>
+      <source>(%n second(s))</source>
+      <translation>
+        <numerusform>(%n giây)</numerusform>
+      </translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/modulesystem/RequirementsChecker.cpp" line="121"/>
+      <source>System-requirements checking is complete.</source>
+      <translation>Kiểm tra yêu cầu hệ thống đã hoàn tất.</translation>
+    </message>
+  </context>
+  <context>
+    <name>Calamares::ViewManager</name>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="150"/>
+      <source>Setup Failed</source>
+      <translation>Thiết lập không thành công</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="150"/>
+      <source>Installation Failed</source>
+      <translation>Cài đặt thất bại</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="151"/>
+      <source>Would you like to paste the install log to the web?</source>
+      <translation>Bạn có muốn gửi nhật ký cài đặt lên web không?</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="164"/>
+      <source>Error</source>
+      <translation>Lỗi</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="171"/>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="518"/>
+      <source>&amp;Yes</source>
+      <translation>&amp;Có</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="172"/>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="519"/>
+      <source>&amp;No</source>
+      <translation>&amp;Không</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="178"/>
+      <source>&amp;Close</source>
+      <translation>Đón&amp;g</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="189"/>
+      <source>Install Log Paste URL</source>
+      <translation>URL để gửi nhật ký cài đặt</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="192"/>
+      <source>The upload was unsuccessful. No web-paste was done.</source>
+      <translation>Tải lên không thành công. Không có quá trình gửi lên web nào được thực hiện.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="208"/>
+      <source>Calamares Initialization Failed</source>
+      <translation>Khởi tạo không thành công</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="209"/>
+      <source>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</source>
+      <translation>%1 không thể được cài đặt.Không thể tải tất cả các mô-đun đã định cấu hình. Đây là vấn đề với cách phân phối sử dụng.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="215"/>
+      <source>&lt;br/&gt;The following modules could not be loaded:</source>
+      <translation>&lt;br/&gt; Không thể tải các mô-đun sau:</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="327"/>
+      <source>Continue with setup?</source>
+      <translation>Tiếp tục thiết lập?</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="327"/>
+      <source>Continue with installation?</source>
+      <translation>Tiếp tục cài đặt?</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="329"/>
+      <source>The %1 setup program is about to make changes to your disk in order to set up %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
+      <translation>Chương trình thiết lập %1 sắp thực hiện các thay đổi đối với đĩa của bạn để thiết lập %2. &lt;br/&gt; &lt;strong&gt; Bạn sẽ không thể hoàn tác các thay đổi này. &lt;/strong&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="332"/>
+      <source>The %1 installer is about to make changes to your disk in order to install %2.&lt;br/&gt;&lt;strong&gt;You will not be able to undo these changes.&lt;/strong&gt;</source>
+      <translation>Trình cài đặt %1 sắp thực hiện các thay đổi đối với đĩa của bạn để cài đặt %2. &lt;br/&gt; &lt;strong&gt; Bạn sẽ không thể hoàn tác các thay đổi này. &lt;/strong&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="335"/>
+      <source>&amp;Set up now</source>
+      <translation>&amp;Thiết lập ngay</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="335"/>
+      <source>&amp;Install now</source>
+      <translation>&amp;Cài đặt ngay</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="343"/>
+      <source>Go &amp;back</source>
+      <translation>&amp;Quay lại</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
+      <source>&amp;Set up</source>
+      <translation>&amp;Thiết lập</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="392"/>
+      <source>&amp;Install</source>
+      <translation>&amp;Cài đặt</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="394"/>
+      <source>Setup is complete. Close the setup program.</source>
+      <translation>Thiết lập hoàn tất. Đóng chương trình cài đặt.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="395"/>
+      <source>The installation is complete. Close the installer.</source>
+      <translation>Quá trình cài đặt hoàn tất. Đóng trình cài đặt.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="397"/>
+      <source>Cancel setup without changing the system.</source>
+      <translation>Hủy thiết lập mà không thay đổi hệ thống.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="398"/>
+      <source>Cancel installation without changing the system.</source>
+      <translation>Hủy cài đặt mà không thay đổi hệ thống.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="408"/>
+      <source>&amp;Next</source>
+      <translation>&amp;Tiếp</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="413"/>
+      <source>&amp;Back</source>
+      <translation>&amp;Quay lại</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="419"/>
+      <source>&amp;Done</source>
+      <translation>&amp;Xong</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="438"/>
+      <source>&amp;Cancel</source>
+      <translation>&amp;Hủy</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="511"/>
+      <source>Cancel setup?</source>
+      <translation>Hủy thiết lập?</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="511"/>
+      <source>Cancel installation?</source>
+      <translation>Hủy cài đặt?</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="512"/>
+      <source>Do you really want to cancel the current setup process?
+The setup program will quit and all changes will be lost.</source>
+      <translation>Bạn có thực sự muốn hủy quá trình thiết lập hiện tại không?
+Chương trình thiết lập sẽ thoát và tất cả các thay đổi sẽ bị mất.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamaresui/ViewManager.cpp" line="514"/>
+      <source>Do you really want to cancel the current install process?
+The installer will quit and all changes will be lost.</source>
+      <translation>Bạn có thực sự muốn hủy quá trình cài đặt hiện tại không?
+Trình cài đặt sẽ thoát và tất cả các thay đổi sẽ bị mất.</translation>
+    </message>
+  </context>
+  <context>
+    <name>CalamaresPython::Helper</name>
+    <message>
+      <location filename="../src/libcalamares/PythonHelper.cpp" line="288"/>
+      <source>Unknown exception type</source>
+      <translation>Không nhận ra kiểu của ngoại lệ</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonHelper.cpp" line="306"/>
+      <source>unparseable Python error</source>
+      <translation>lỗi không thể phân tích cú pháp Python</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonHelper.cpp" line="350"/>
+      <source>unparseable Python traceback</source>
+      <translation>truy vết không thể phân tích cú pháp Python</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/PythonHelper.cpp" line="357"/>
+      <source>Unfetchable Python error.</source>
+      <translation>Lỗi Python không thể try cập.</translation>
+    </message>
+  </context>
+  <context>
+    <name>CalamaresUtils</name>
+    <message>
+      <location filename="../src/libcalamaresui/utils/Paste.cpp" line="25"/>
+      <source>Install log posted to:
+%1</source>
+      <translation>Cài đặt nhật ký được đăng lên:
+%1</translation>
+    </message>
+  </context>
+  <context>
+    <name>CalamaresWindow</name>
+    <message>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="101"/>
+      <source>Show debug information</source>
+      <translation>Hiện thông tin gỡ lỗi</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="155"/>
+      <source>&amp;Back</source>
+      <translation>Trở &amp;về</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="167"/>
+      <source>&amp;Next</source>
+      <translation>&amp;Tiếp theo</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="180"/>
+      <source>&amp;Cancel</source>
+      <translation>&amp;Hủy bỏ</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="304"/>
+      <source>%1 Setup Program</source>
+      <translation>%1 Thiết lập chương trình</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/CalamaresWindow.cpp" line="305"/>
+      <source>%1 Installer</source>
+      <translation>%1 cài đặt hệ điều hành</translation>
+    </message>
+  </context>
+  <context>
+    <name>CheckerContainer</name>
+    <message>
+      <location filename="../src/modules/welcome/checker/CheckerContainer.cpp" line="37"/>
+      <source>Gathering system information...</source>
+      <translation>Thu thập thông tin hệ thống ...</translation>
+    </message>
+  </context>
+  <context>
+    <name>ChoicePage</name>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="126"/>
+      <source>Select storage de&amp;vice:</source>
+      <translation>&amp;Chọn thiết bị lưu trữ:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="127"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="963"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1008"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1098"/>
+      <source>Current:</source>
+      <translation>Hiện tại:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="128"/>
+      <source>After:</source>
+      <translation>Sau khi cài đặt:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="305"/>
+      <source>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</source>
+      <translation>&lt;strong&gt; Phân vùng thủ công &lt;/strong&gt; &lt;br/&gt; Bạn có thể tự tạo hoặc thay đổi kích thước phân vùng.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="831"/>
+      <source>Reuse %1 as home partition for %2.</source>
+      <translation>Sử dụng lại %1 làm phân vùng chính cho %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="964"/>
+      <source>&lt;strong&gt;Select a partition to shrink, then drag the bottom bar to resize&lt;/strong&gt;</source>
+      <translation>&lt;strong&gt; Chọn một phân vùng để thu nhỏ, sau đó kéo thanh dưới cùng để thay đổi kích thước &lt;/strong&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="981"/>
+      <source>%1 will be shrunk to %2MiB and a new %3MiB partition will be created for %4.</source>
+      <translation>%1 sẽ được thu nhỏ thành %2MiB và phân vùng %3MiB mới sẽ được tạo cho %4.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1037"/>
+      <source>Boot loader location:</source>
+      <translation>Vị trí bộ tải khởi động:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1089"/>
+      <source>&lt;strong&gt;Select a partition to install on&lt;/strong&gt;</source>
+      <translation>&lt;strong&gt; Chọn phân vùng để cài đặt &lt;/strong&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1146"/>
+      <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
+      <translation>Không thể tìm thấy phân vùng hệ thống EFI ở bất kỳ đâu trên hệ thống này. Vui lòng quay lại và sử dụng phân vùng thủ công để thiết lập %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1154"/>
+      <source>The EFI system partition at %1 will be used for starting %2.</source>
+      <translation>Phân vùng hệ thống EFI tại %1 sẽ được sử dụng để bắt đầu %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1162"/>
+      <source>EFI system partition:</source>
+      <translation>Phân vùng hệ thống EFI:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1296"/>
+      <source>This storage device does not seem to have an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
+      <translation>Thiết bị lưu trữ này dường như không có hệ điều hành trên đó. Bạn muốn làm gì? &lt;br/&gt; Bạn sẽ có thể xem xét và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1338"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1360"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1385"/>
+      <source>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color="red"&gt;delete&lt;/font&gt; all data currently present on the selected storage device.</source>
+      <translation>&lt;strong&gt; Xóa đĩa &lt;/strong&gt; &lt;br/&gt; Thao tác này sẽ &lt;font color = "red"&gt; xóa &lt;/font&gt; tất cả dữ liệu hiện có trên thiết bị lưu trữ đã chọn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1305"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1334"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1356"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1381"/>
+      <source>&lt;strong&gt;Install alongside&lt;/strong&gt;&lt;br/&gt;The installer will shrink a partition to make room for %1.</source>
+      <translation>&lt;strong&gt; Cài đặt cùng với &lt;/strong&gt; &lt;br/&gt; Trình cài đặt sẽ thu nhỏ phân vùng để nhường chỗ cho %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1309"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1343"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1364"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1389"/>
+      <source>&lt;strong&gt;Replace a partition&lt;/strong&gt;&lt;br/&gt;Replaces a partition with %1.</source>
+      <translation>&lt;strong&gt; Thay thế phân vùng &lt;/strong&gt; &lt;br/&gt; Thay thế phân vùng bằng %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/>
+      <source>This storage device has %1 on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
+      <translation>Thiết bị lưu trữ này có %1 trên đó. Bạn muốn làm gì? &lt;br/&gt; Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/>
+      <source>This storage device already has an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
+      <translation>Thiết bị lưu trữ này đã có hệ điều hành trên đó. Bạn muốn làm gì? &lt;br/&gt; Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1376"/>
+      <source>This storage device has multiple operating systems on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
+      <translation>Thiết bị lưu trữ này có nhiều hệ điều hành trên đó. Bạn muốn làm gì? &lt;br/&gt; Bạn sẽ có thể xem lại và xác nhận lựa chọn của mình trước khi thực hiện bất kỳ thay đổi nào đối với thiết bị lưu trữ.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
+      <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
+      <translation>Thiết bị lưu trữ này đã có sẵn hệ điều hành, nhưng bảng phân vùng &lt;strong&gt; %1 &lt;/strong&gt; khác với bảng &lt;strong&gt; %2 &lt;/strong&gt; cần thiết. &lt;br/&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
+      <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
+      <translation>Thiết bị lưu trữ này có một trong các phân vùng được &lt;strong&gt; gắn kết &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
+      <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
+      <translation>Thiết bị lưu trữ này là một phần của thiết bị &lt;strong&gt; RAID không hoạt động &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
+      <source>No Swap</source>
+      <translation>Không hoán đổi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1611"/>
+      <source>Reuse Swap</source>
+      <translation>Sử dụng lại Hoán đổi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1614"/>
+      <source>Swap (no Hibernate)</source>
+      <translation>Hoán đổi (không ngủ đông)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1617"/>
+      <source>Swap (with Hibernate)</source>
+      <translation>Hoán đổi (ngủ đông)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1620"/>
+      <source>Swap to file</source>
+      <translation>Hoán đổi sang tệp</translation>
+    </message>
+  </context>
+  <context>
+    <name>ClearMountsJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="42"/>
+      <source>Clear mounts for partitioning operations on %1</source>
+      <translation>Xóa gắn kết cho các hoạt động phân vùng trên %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="49"/>
+      <source>Clearing mounts for partitioning operations on %1.</source>
+      <translation>Xóa các gắn kết cho các hoạt động phân vùng trên %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearMountsJob.cpp" line="224"/>
+      <source>Cleared all mounts for %1</source>
+      <translation>Đã xóa tất cả các gắn kết cho %1</translation>
+    </message>
+  </context>
+  <context>
+    <name>ClearTempMountsJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="32"/>
+      <source>Clear all temporary mounts.</source>
+      <translation>Xóa tất cả các gắn kết tạm thời.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="39"/>
+      <source>Clearing all temporary mounts.</source>
+      <translation>Đang xóa tất cả các gắn kết tạm thời.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="51"/>
+      <source>Cannot get list of temporary mounts.</source>
+      <translation>Không thể lấy danh sách các gắn kết tạm thời.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ClearTempMountsJob.cpp" line="92"/>
+      <source>Cleared all temporary mounts.</source>
+      <translation>Xóa tất cả các gắn kết tạm thời.</translation>
+    </message>
+  </context>
+  <context>
+    <name>CommandList</name>
+    <message>
+      <location filename="../src/libcalamares/utils/CommandList.cpp" line="142"/>
+      <location filename="../src/libcalamares/utils/CommandList.cpp" line="155"/>
+      <source>Could not run command.</source>
+      <translation>Không thể chạy lệnh.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CommandList.cpp" line="143"/>
+      <source>The command runs in the host environment and needs to know the root path, but no rootMountPoint is defined.</source>
+      <translation>Lệnh chạy trong môi trường máy chủ và cần biết đường dẫn gốc, nhưng không có biến rootMountPoint nào được xác định.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CommandList.cpp" line="156"/>
+      <source>The command needs to know the user's name, but no username is defined.</source>
+      <translation>Lệnh cần biết tên của người dùng, nhưng không có tên người dùng nào được xác định.</translation>
+    </message>
+  </context>
+  <context>
+    <name>Config</name>
+    <message>
+      <location filename="../src/modules/keyboard/Config.cpp" line="340"/>
+      <source>Set keyboard model to %1.&lt;br/&gt;</source>
+      <translation>Thiệt lập bàn phím kiểu %1.&lt;br/&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/Config.cpp" line="347"/>
+      <source>Set keyboard layout to %1/%2.</source>
+      <translation>Thiết lập bố cục bàn phím thành %1/%2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/Config.cpp" line="334"/>
+      <source>Set timezone to %1/%2.</source>
+      <translation>Thiết lập múi giờ sang %1/%2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/Config.cpp" line="372"/>
+      <source>The system language will be set to %1.</source>
+      <translation>Ngôn ngữ hệ thống sẽ được đặt thành %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/Config.cpp" line="379"/>
+      <source>The numbers and dates locale will be set to %1.</source>
+      <translation>Định dạng ngôn ngữ của số và ngày tháng sẽ được chuyển thành %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="38"/>
+      <source>Network Installation. (Disabled: Incorrect configuration)</source>
+      <translation>Cài đặt mạng. (Tắt: Sai cấu hình)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="40"/>
+      <source>Network Installation. (Disabled: Received invalid groups data)</source>
+      <translation>Cài đặt mạng. (Tắt: Nhận được dữ liệu nhóm bị sai)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="42"/>
+      <source>Network Installation. (Disabled: internal error)</source>
+      <translation>Cài đặt mạng. (Tắt: Lỗi nội bộ)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/Config.cpp" line="44"/>
+      <source>Network Installation. (Disabled: Unable to fetch package lists, check your network connection)</source>
+      <translation>Cài đặt mạng. (Tắt: Không thể lấy được danh sách gói ứng dụng, kiểm tra kết nối mạng)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="50"/>
+      <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
+      <translation>Máy tính này không đạt đủ yêu cấu tối thiểu để thiết lập %1.&lt;br/&gt;Không thể tiếp tục thiết lập. &lt;a href="#details"&gt;Chi tiết...&lt;/a&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="54"/>
+      <source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
+      <translation>Máy tính này không đạt đủ yêu cấu tối thiểu để cài đặt %1.&lt;br/&gt;Không thể tiếp tục cài đặt. &lt;a href="#details"&gt;Chi tiết...&lt;/a&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="61"/>
+      <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
+      <translation>Máy tính này không đạt đủ yêu cấu khuyến nghị để thiết lập %1.&lt;br/&gt;Thiết lập có thể tiếp tục, nhưng một số tính năng có thể sẽ bị tắt.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="65"/>
+      <source>This computer does not satisfy some of the recommended requirements for installing %1.&lt;br/&gt;Installation can continue, but some features might be disabled.</source>
+      <translation>Máy tính này không đạt đủ yêu cấu khuyến nghị để cài đặt %1.&lt;br/&gt;Cài đặt có thể tiếp tục, nhưng một số tính năng có thể sẽ bị tắt.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="75"/>
+      <source>This program will ask you some questions and set up %2 on your computer.</source>
+      <translation>Chương trình này sẽ hỏi bạn vài câu hỏi và thiết lập %2 trên máy tính của bạn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="244"/>
+      <source>&lt;h1&gt;Welcome to the Calamares setup program for %1&lt;/h1&gt;</source>
+      <translation>&lt;h1&gt;Chào mừng đến với chương trình Calamares để thiết lập %1&lt;/h1&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="245"/>
+      <source>&lt;h1&gt;Welcome to %1 setup&lt;/h1&gt;</source>
+      <translation>&lt;h1&gt;Chào mừng đến với thiết lập %1 &lt;/h1&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="250"/>
+      <source>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</source>
+      <translation>&lt;h1&gt;Chào mừng đến với chương trình Calamares để cài đặt %1&lt;/h1&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/Config.cpp" line="251"/>
+      <source>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</source>
+      <translation>&lt;h1&gt;Chào mừng đến với bộ cài đặt %1 &lt;/h1&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="164"/>
+      <source>Your username is too long.</source>
+      <translation>Tên bạn hơi dài.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="170"/>
+      <source>'%1' is not allowed as username.</source>
+      <translation>'%1' không được phép dùng làm tên.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="177"/>
+      <source>Your username must start with a lowercase letter or underscore.</source>
+      <translation>Tên người dùng của bạn phải bắt đầu bằng chữ cái viết thường hoặc dấu gạch dưới.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="181"/>
+      <source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source>
+      <translation>Chỉ cho phép các chữ cái viết thường, số, gạch dưới và gạch nối.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="227"/>
+      <source>Your hostname is too short.</source>
+      <translation>Tên máy chủ quá ngắn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="231"/>
+      <source>Your hostname is too long.</source>
+      <translation>Tên máy chủ quá dài.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="237"/>
+      <source>'%1' is not allowed as hostname.</source>
+      <translation>'%1' không được phép dùng làm tên máy chủ.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="243"/>
+      <source>Only letters, numbers, underscore and hyphen are allowed.</source>
+      <translation>Chỉ cho phép các chữ cái, số, gạch dưới và gạch nối.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="446"/>
+      <source>Your passwords do not match!</source>
+      <translation>Mật khẩu nhập lại không khớp!</translation>
+    </message>
+  </context>
+  <context>
+    <name>ContextualProcessJob</name>
+    <message>
+      <location filename="../src/modules/contextualprocess/ContextualProcessJob.cpp" line="119"/>
+      <source>Contextual Processes Job</source>
+      <translation>Công việc xử lý theo ngữ cảnh</translation>
+    </message>
+  </context>
+  <context>
+    <name>CreatePartitionDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="18"/>
+      <source>Create a Partition</source>
+      <translation>Tạo phân vùng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="42"/>
+      <source>Si&amp;ze:</source>
+      <translation>&amp;Kích thước:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="52"/>
+      <source> MiB</source>
+      <translation> MiB</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="59"/>
+      <source>Partition &amp;Type:</source>
+      <translation>&amp;Loại phân vùng:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="71"/>
+      <source>&amp;Primary</source>
+      <translation>&amp;Sơ cấp</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="81"/>
+      <source>E&amp;xtended</source>
+      <translation>&amp;Mở rộng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="123"/>
+      <source>Fi&amp;le System:</source>
+      <translation>&amp;Tập tin hệ thống:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="155"/>
+      <source>LVM LV name</source>
+      <translation>Tên LVM LV</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="165"/>
+      <source>&amp;Mount Point:</source>
+      <translation>&amp;Điểm gắn kết:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.ui" line="192"/>
+      <source>Flags:</source>
+      <translation>Cờ:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="66"/>
+      <source>En&amp;crypt</source>
+      <translation>&amp;Mã hóa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="161"/>
+      <source>Logical</source>
+      <translation>Lô-gic</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="166"/>
+      <source>Primary</source>
+      <translation>Sơ cấp</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="185"/>
+      <source>GPT</source>
+      <translation>GPT</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionDialog.cpp" line="265"/>
+      <source>Mountpoint already in use. Please select another one.</source>
+      <translation>Điểm gắn kết đã được sử dụng. Vui lòng chọn một cái khác.</translation>
+    </message>
+  </context>
+  <context>
+    <name>CreatePartitionJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="38"/>
+      <source>Create new %2MiB partition on %4 (%3) with file system %1.</source>
+      <translation>Tạo phân vùng %2MiB mới trên %4 (%3) với hệ thống tệp %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="49"/>
+      <source>Create new &lt;strong&gt;%2MiB&lt;/strong&gt; partition on &lt;strong&gt;%4&lt;/strong&gt; (%3) with file system &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Tạo phân vùng &lt;strong&gt;%2MiB &lt;/strong&gt; mới trên &lt;strong&gt;%4 &lt;/strong&gt; (%3) với hệ thống tệp &lt;strong&gt;%1 &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="61"/>
+      <source>Creating new %1 partition on %2.</source>
+      <translation>Tạo phân vùng %1 mới trên %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionJob.cpp" line="73"/>
+      <source>The installer failed to create partition on disk '%1'.</source>
+      <translation>Trình cài đặt không tạo được phân vùng trên đĩa '%1'.</translation>
+    </message>
+  </context>
+  <context>
+    <name>CreatePartitionTableDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="24"/>
+      <source>Create Partition Table</source>
+      <translation>Tạo bảng phân vùng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="43"/>
+      <source>Creating a new partition table will delete all existing data on the disk.</source>
+      <translation>Tạo bảng phân vùng mới sẽ xóa tất cả dữ liệu hiện có trên đĩa.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="69"/>
+      <source>What kind of partition table do you want to create?</source>
+      <translation>Bạn muốn tạo loại bảng phân vùng nào?</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="76"/>
+      <source>Master Boot Record (MBR)</source>
+      <translation>Bản ghi khởi động chính (MBR)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/CreatePartitionTableDialog.ui" line="86"/>
+      <source>GUID Partition Table (GPT)</source>
+      <translation>Bảng phân vùng GUID (GPT)</translation>
+    </message>
+  </context>
+  <context>
+    <name>CreatePartitionTableJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="39"/>
+      <source>Create new %1 partition table on %2.</source>
+      <translation>Tạo bảng phân vùng %1 mới trên %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="47"/>
+      <source>Create new &lt;strong&gt;%1&lt;/strong&gt; partition table on &lt;strong&gt;%2&lt;/strong&gt; (%3).</source>
+      <translation>Tạo bảng phân vùng &lt;strong&gt;%1 &lt;/strong&gt; mới trên &lt;strong&gt;%2 &lt;/strong&gt; (%3).</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="57"/>
+      <source>Creating new %1 partition table on %2.</source>
+      <translation>Tạo bảng phân vùng %1 mới trên %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreatePartitionTableJob.cpp" line="75"/>
+      <source>The installer failed to create a partition table on %1.</source>
+      <translation>Trình cài đặt không tạo được bảng phân vùng trên %1.</translation>
+    </message>
+  </context>
+  <context>
+    <name>CreateUserJob</name>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="40"/>
+      <source>Create user %1</source>
+      <translation>Khởi tạo người dùng %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="47"/>
+      <source>Create user &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Tạo người dùng &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="54"/>
+      <source>Creating user %1.</source>
+      <translation>Đang tạo người dùng %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="186"/>
+      <source>Cannot create sudoers file for writing.</source>
+      <translation>Không thể tạo tệp sudoers để viết.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="181"/>
+      <source>Cannot chmod sudoers file.</source>
+      <translation>Không thể sửa đổi mod của tệp sudoers.</translation>
+    </message>
+  </context>
+  <context>
+    <name>CreateVolumeGroupDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/CreateVolumeGroupDialog.cpp" line="28"/>
+      <source>Create Volume Group</source>
+      <translation>Tạo nhóm ổ đĩa</translation>
+    </message>
+  </context>
+  <context>
+    <name>CreateVolumeGroupJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="31"/>
+      <source>Create new volume group named %1.</source>
+      <translation>Tạo nhóm ổ đĩa mới có tên %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="37"/>
+      <source>Create new volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Tạo nhóm ổ đĩa mới có tên &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="43"/>
+      <source>Creating new volume group named %1.</source>
+      <translation>Đang tạo nhóm ổ đĩa mới có tên %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/CreateVolumeGroupJob.cpp" line="55"/>
+      <source>The installer failed to create a volume group named '%1'.</source>
+      <translation>Trình cài đặt không tạo được nhóm ổ đĩa có tên '%1'.</translation>
+    </message>
+  </context>
+  <context>
+    <name>DeactivateVolumeGroupJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="24"/>
+      <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="36"/>
+      <source>Deactivate volume group named %1.</source>
+      <translation>Hủy kích hoạt nhóm ổ đĩa có tên %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="30"/>
+      <source>Deactivate volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Hủy kích hoạt nhóm ổ đĩa có tên &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="48"/>
+      <source>The installer failed to deactivate a volume group named %1.</source>
+      <translation>Trình cài đặt không thể hủy kích hoạt nhóm ổ đĩa có tên %1.</translation>
+    </message>
+  </context>
+  <context>
+    <name>DeletePartitionJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="31"/>
+      <source>Delete partition %1.</source>
+      <translation>Xóa phân vùng %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="38"/>
+      <source>Delete partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Xóa phân vùng &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="45"/>
+      <source>Deleting partition %1.</source>
+      <translation>Đang xóa phân vùng %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/DeletePartitionJob.cpp" line="56"/>
+      <source>The installer failed to delete partition %1.</source>
+      <translation>Trình cài đặt không thể xóa phân vùng %1.</translation>
+    </message>
+  </context>
+  <context>
+    <name>DeviceInfoWidget</name>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="97"/>
+      <source>This device has a &lt;strong&gt;%1&lt;/strong&gt; partition table.</source>
+      <translation>Thiết bị này có bảng phân vùng &lt;strong&gt; %1 &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="104"/>
+      <source>This is a &lt;strong&gt;loop&lt;/strong&gt; device.&lt;br&gt;&lt;br&gt;It is a pseudo-device with no partition table that makes a file accessible as a block device. This kind of setup usually only contains a single filesystem.</source>
+      <translation>Đây là thiết bị &lt;strong&gt; vòng lặp &lt;/strong&gt;. &lt;br&gt; &lt;br&gt; Đây là thiết bị giả không có bảng phân vùng giúp tệp có thể truy cập được dưới dạng thiết bị khối. Loại thiết lập này thường chỉ chứa một hệ thống tệp duy nhất.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="111"/>
+      <source>This installer &lt;strong&gt;cannot detect a partition table&lt;/strong&gt; on the selected storage device.&lt;br&gt;&lt;br&gt;The device either has no partition table, or the partition table is corrupted or of an unknown type.&lt;br&gt;This installer can create a new partition table for you, either automatically, or through the manual partitioning page.</source>
+      <translation>Trình cài đặt này &lt;strong&gt; không thể phát hiện bảng phân vùng &lt;/strong&gt; trên thiết bị lưu trữ đã chọn. &lt;br&gt; &lt;br&gt; Thiết bị không có bảng phân vùng hoặc bảng phân vùng bị hỏng hoặc thuộc loại không xác định. &lt;br&gt; Điều này trình cài đặt có thể tạo bảng phân vùng mới cho bạn, tự động hoặc thông qua trang phân vùng thủ công.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="121"/>
+      <source>&lt;br&gt;&lt;br&gt;This is the recommended partition table type for modern systems which start from an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.</source>
+      <translation>&lt;br&gt; &lt;br&gt; Đây là loại bảng phân vùng được khuyến nghị cho các hệ thống hiện đại bắt đầu từ môi trường khởi động &lt;strong&gt; EFI &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="127"/>
+      <source>&lt;br&gt;&lt;br&gt;This partition table type is only advisable on older systems which start from a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment. GPT is recommended in most other cases.&lt;br&gt;&lt;br&gt;&lt;strong&gt;Warning:&lt;/strong&gt; the MBR partition table is an obsolete MS-DOS era standard.&lt;br&gt;Only 4 &lt;em&gt;primary&lt;/em&gt; partitions may be created, and of those 4, one can be an &lt;em&gt;extended&lt;/em&gt; partition, which may in turn contain many &lt;em&gt;logical&lt;/em&gt; partitions.</source>
+      <translation>&lt;br&gt; &lt;br&gt; Loại bảng phân vùng này chỉ được khuyến khích trên các hệ thống cũ hơn bắt đầu từ môi trường khởi động &lt;strong&gt; BIOS &lt;/strong&gt;. GPT được khuyến nghị trong hầu hết các trường hợp khác. &lt;br&gt; &lt;br&gt; &lt;strong&gt; Cảnh báo: &lt;/strong&gt; bảng phân vùng MBR là tiêu chuẩn thời đại MS-DOS lỗi thời. &lt;br&gt; Chỉ có 4 phân vùng &lt;em&gt; chính &lt;/em&gt; có thể được tạo và trong số 4 phân vùng đó, một phân vùng có thể là phân vùng &lt;em&gt; mở rộng &lt;/em&gt;, đến lượt nó có thể chứa nhiều phân vùng &lt;em&gt; logic &lt;/em&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="140"/>
+      <source>The type of &lt;strong&gt;partition table&lt;/strong&gt; on the selected storage device.&lt;br&gt;&lt;br&gt;The only way to change the partition table type is to erase and recreate the partition table from scratch, which destroys all data on the storage device.&lt;br&gt;This installer will keep the current partition table unless you explicitly choose otherwise.&lt;br&gt;If unsure, on modern systems GPT is preferred.</source>
+      <translation>Loại &lt;strong&gt; bảng phân vùng &lt;/strong&gt; trên thiết bị lưu trữ đã chọn. &lt;br&gt; &lt;br&gt; Cách duy nhất để thay đổi loại bảng phân vùng là xóa và tạo lại bảng phân vùng từ đầu, việc này sẽ hủy tất cả dữ liệu trên thiết bị lưu trữ. &lt;br&gt; Trình cài đặt này sẽ giữ bảng phân vùng hiện tại trừ khi bạn chọn rõ ràng khác. &lt;br&gt; Nếu không chắc chắn, trên các hệ thống hiện đại, GPT được ưu tiên hơn.</translation>
+    </message>
+  </context>
+  <context>
+    <name>DeviceModel</name>
+    <message>
+      <location filename="../src/modules/partition/core/DeviceModel.cpp" line="84"/>
+      <source>%1 - %2 (%3)</source>
+      <extracomment>device[name] - size[number] (device-node[name])</extracomment>
+      <translation>%1 - %2 (%3)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/DeviceModel.cpp" line="95"/>
+      <source>%1 - (%2)</source>
+      <extracomment>device[name] - (device-node[name])</extracomment>
+      <translation>%1 - (%2)</translation>
+    </message>
+  </context>
+  <context>
+    <name>DracutLuksCfgJob</name>
+    <message>
+      <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="127"/>
+      <source>Write LUKS configuration for Dracut to %1</source>
+      <translation>Lưu cấu hình LUKS cho Dracut vào %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="131"/>
+      <source>Skip writing LUKS configuration for Dracut: "/" partition is not encrypted</source>
+      <translation>Không lưu cấu hình LUKS cho Dracut: phân vùng "/" không được mã hoá</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/dracutlukscfg/DracutLuksCfgJob.cpp" line="148"/>
+      <source>Failed to open %1</source>
+      <translation>Mở %1 thất bại</translation>
+    </message>
+  </context>
+  <context>
+    <name>DummyCppJob</name>
+    <message>
+      <location filename="../src/modules/dummycpp/DummyCppJob.cpp" line="37"/>
+      <source>Dummy C++ Job</source>
+      <translation>Công việc C++ ví dụ</translation>
+    </message>
+  </context>
+  <context>
+    <name>EditExistingPartitionDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="24"/>
+      <source>Edit Existing Partition</source>
+      <translation>Chỉnh sửa phân vùng hiện có</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="54"/>
+      <source>Content:</source>
+      <translation>Nội dung:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="64"/>
+      <source>&amp;Keep</source>
+      <translation>&amp;Giữ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="74"/>
+      <source>Format</source>
+      <translation>Định dạng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="93"/>
+      <source>Warning: Formatting the partition will erase all existing data.</source>
+      <translation>Cảnh báo: Định dạng phân vùng sẽ xóa tất cả dữ liệu hiện có.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="103"/>
+      <source>&amp;Mount Point:</source>
+      <translation>&amp;Điểm gắn kết:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="123"/>
+      <source>Si&amp;ze:</source>
+      <translation>&amp;Kích thước:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="133"/>
+      <source> MiB</source>
+      <translation> MiB</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="140"/>
+      <source>Fi&amp;le System:</source>
+      <translation>&amp;Tập tin hệ thống:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.ui" line="153"/>
+      <source>Flags:</source>
+      <translation>Cờ:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="272"/>
+      <source>Mountpoint already in use. Please select another one.</source>
+      <translation>Điểm gắn kết đã được sử dụng. Vui lòng chọn một cái khác.</translation>
+    </message>
+  </context>
+  <context>
+    <name>EncryptWidget</name>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="36"/>
+      <source>En&amp;crypt system</source>
+      <translation>&amp;Mã hóa hệ thống</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="46"/>
+      <source>Passphrase</source>
+      <translation>Cụm mật khẩu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.ui" line="56"/>
+      <source>Confirm passphrase</source>
+      <translation>Xác nhận cụm mật khẩu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="104"/>
+      <location filename="../src/modules/partition/gui/EncryptWidget.cpp" line="114"/>
+      <source>Please enter the same passphrase in both boxes.</source>
+      <translation>Vui lòng nhập cùng một cụm mật khẩu vào cả hai hộp.</translation>
+    </message>
+  </context>
+  <context>
+    <name>FillGlobalStorageJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="138"/>
+      <source>Set partition information</source>
+      <translation>Đặt thông tin phân vùng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="164"/>
+      <source>Install %1 on &lt;strong&gt;new&lt;/strong&gt; %2 system partition.</source>
+      <translation>Cài đặt %1 trên phân vùng hệ thống &lt;strong&gt; mới &lt;/strong&gt; %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="170"/>
+      <source>Set up &lt;strong&gt;new&lt;/strong&gt; %2 partition with mount point &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Thiết lập phân vùng &lt;strong&gt; mới &lt;/strong&gt; %2 với điểm gắn kết &lt;strong&gt; %1 &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="180"/>
+      <source>Install %2 on %3 system partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Cài đặt %2 trên phân vùng hệ thống %3 &lt;strong&gt; %1 &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="187"/>
+      <source>Set up %3 partition &lt;strong&gt;%1&lt;/strong&gt; with mount point &lt;strong&gt;%2&lt;/strong&gt;.</source>
+      <translation>Thiết lập phân vùng %3 &lt;strong&gt; %1 &lt;/strong&gt; với điểm gắn kết &lt;strong&gt; %2 &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="200"/>
+      <source>Install boot loader on &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Cài đặt trình tải khởi động trên &lt;strong&gt; %1 &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FillGlobalStorageJob.cpp" line="209"/>
+      <source>Setting up mount points.</source>
+      <translation>Thiết lập điểm gắn kết.</translation>
+    </message>
+  </context>
+  <context>
+    <name>FinishedPage</name>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.ui" line="102"/>
+      <source>&amp;Restart now</source>
+      <translation>&amp;Khởi động lại ngay</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="44"/>
+      <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
+      <translation>&lt;h1&gt;Hoàn thành.&lt;/h1&gt;&lt;br/&gt;%1 đã được cài đặt thành công.&lt;br/&gt;Hãy khởi động lại máy tính.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="48"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style="font-style:italic;"&gt;Done&lt;/span&gt; or close the setup program.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tích chọn để khởi động lại sau khi ấn &lt;span style="font-style:italic;"&gt;Hoàn thành&lt;/span&gt; hoặc đóng phần mềm thiết lập.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="54"/>
+      <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been installed on your computer.&lt;br/&gt;You may now restart into your new system, or continue using the %2 Live environment.</source>
+      <translation>&lt;h1&gt;Hoàn thành.&lt;/h1&gt;&lt;br/&gt;%1 đã được cài đặt trên máy.&lt;br/&gt;hãy khởi động lại, hoặc cũng có thể tiếp tục sử dụng %2 môi trường USB.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="59"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;When this box is checked, your system will restart immediately when you click on &lt;span style="font-style:italic;"&gt;Done&lt;/span&gt; or close the installer.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Tích chọn để khởi động lại sau khi ấn &lt;span style="font-style:italic;"&gt;Hoàn thành&lt;/span&gt; hoặc đóng phần mềm cài đặt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="116"/>
+      <source>&lt;h1&gt;Setup Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been set up on your computer.&lt;br/&gt;The error message was: %2.</source>
+      <translation>&lt;h1&gt;Thiết lập lỗi&lt;/h1&gt;&lt;br/&gt;%1 đã không được thiết lập trên máy tính.&lt;br/&gt;tin báo lỗi: %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedPage.cpp" line="122"/>
+      <source>&lt;h1&gt;Installation Failed&lt;/h1&gt;&lt;br/&gt;%1 has not been installed on your computer.&lt;br/&gt;The error message was: %2.</source>
+      <translation>&lt;h1&gt;Cài đặt lỗi&lt;/h1&gt;&lt;br/&gt;%1 chưa được cài đặt trên máy tính&lt;br/&gt;Tin báo lỗi: %2.</translation>
+    </message>
+  </context>
+  <context>
+    <name>FinishedViewStep</name>
+    <message>
+      <location filename="../src/modules/finished/FinishedViewStep.cpp" line="67"/>
+      <source>Finish</source>
+      <translation>Hoàn thành</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedViewStep.cpp" line="125"/>
+      <source>Setup Complete</source>
+      <translation>Thiết lập xong</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedViewStep.cpp" line="125"/>
+      <source>Installation Complete</source>
+      <translation>Cài đặt xong</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedViewStep.cpp" line="127"/>
+      <source>The setup of %1 is complete.</source>
+      <translation>Thiết lập %1 đã xong.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/finished/FinishedViewStep.cpp" line="128"/>
+      <source>The installation of %1 is complete.</source>
+      <translation>Cài đặt của %1 đã xong.</translation>
+    </message>
+  </context>
+  <context>
+    <name>FormatPartitionJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="36"/>
+      <source>Format partition %1 (file system: %2, size: %3 MiB) on %4.</source>
+      <translation>Định dạng phân vùng %1 (tập tin hệ thống:%2, kích thước: %3 MiB) trên %4.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="47"/>
+      <source>Format &lt;strong&gt;%3MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; with file system &lt;strong&gt;%2&lt;/strong&gt;.</source>
+      <translation>Định dạng &lt;strong&gt;%3MiB&lt;/strong&gt; phân vùng &lt;strong&gt;%1&lt;/strong&gt;với tập tin hệ thống &lt;strong&gt;%2&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="58"/>
+      <source>Formatting partition %1 with file system %2.</source>
+      <translation>Đang định dạng phân vùng %1 với tập tin hệ thống %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/FormatPartitionJob.cpp" line="72"/>
+      <source>The installer failed to format partition %1 on disk '%2'.</source>
+      <translation>Không thể định dạng %1 ở đĩa '%2'.</translation>
+    </message>
+  </context>
+  <context>
+    <name>GeneralRequirements</name>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="149"/>
+      <source>has at least %1 GiB available drive space</source>
+      <translation>có ít nhất %1 GiB dung lượng ổ đĩa khả dụng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="151"/>
+      <source>There is not enough drive space. At least %1 GiB is required.</source>
+      <translation>Không có đủ dung lượng ổ đĩa. Ít nhất %1 GiB là bắt buộc.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="160"/>
+      <source>has at least %1 GiB working memory</source>
+      <translation>có ít nhất %1 GiB bộ nhớ làm việc</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="162"/>
+      <source>The system does not have enough working memory. At least %1 GiB is required.</source>
+      <translation>Hệ thống không có đủ bộ nhớ hoạt động. Ít nhất %1 GiB là bắt buộc.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="171"/>
+      <source>is plugged in to a power source</source>
+      <translation>được cắm vào nguồn điện</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="172"/>
+      <source>The system is not plugged in to a power source.</source>
+      <translation>Hệ thống chưa được cắm vào nguồn điện.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="179"/>
+      <source>is connected to the Internet</source>
+      <translation>được kết nối với Internet</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="180"/>
+      <source>The system is not connected to the Internet.</source>
+      <translation>Hệ thống không được kết nối với Internet.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="187"/>
+      <source>is running the installer as an administrator (root)</source>
+      <translation>đang chạy trình cài đặt với tư cách quản trị viên (root)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="190"/>
+      <source>The setup program is not running with administrator rights.</source>
+      <translation>Chương trình thiết lập không chạy với quyền quản trị viên.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="191"/>
+      <source>The installer is not running with administrator rights.</source>
+      <translation>Trình cài đặt không chạy với quyền quản trị viên.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="199"/>
+      <source>has a screen large enough to show the whole installer</source>
+      <translation>có màn hình đủ lớn để hiển thị toàn bộ trình cài đặt</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="202"/>
+      <source>The screen is too small to display the setup program.</source>
+      <translation>Màn hình quá nhỏ để hiển thị chương trình cài đặt.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/GeneralRequirements.cpp" line="203"/>
+      <source>The screen is too small to display the installer.</source>
+      <translation>Màn hình quá nhỏ để hiển thị trình cài đặt.</translation>
+    </message>
+  </context>
+  <context>
+    <name>HostInfoJob</name>
+    <message>
+      <location filename="../src/modules/hostinfo/HostInfoJob.cpp" line="42"/>
+      <source>Collecting information about your machine.</source>
+      <translation>Thu thập thông tin về máy của bạn.</translation>
+    </message>
+  </context>
+  <context>
+    <name>IDJob</name>
+    <message>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="30"/>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="39"/>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="52"/>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="59"/>
+      <source>OEM Batch Identifier</source>
+      <translation>Định danh lô OEM</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="40"/>
+      <source>Could not create directories &lt;code&gt;%1&lt;/code&gt;.</source>
+      <translation>Không thể tạo thư mục &lt;code&gt; %1 &lt;/code&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="53"/>
+      <source>Could not open file &lt;code&gt;%1&lt;/code&gt;.</source>
+      <translation>Không thể mở được tệp &lt;code&gt; %1 &lt;/code&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/IDJob.cpp" line="60"/>
+      <source>Could not write to file &lt;code&gt;%1&lt;/code&gt;.</source>
+      <translation>Không thể ghi vào tệp &lt;code&gt; %1 &lt;/code&gt;.</translation>
+    </message>
+  </context>
+  <context>
+    <name>InitcpioJob</name>
+    <message>
+      <location filename="../src/modules/initcpio/InitcpioJob.cpp" line="31"/>
+      <source>Creating initramfs with mkinitcpio.</source>
+      <translation>Đang tạo initramfs bằng mkinitcpio.</translation>
+    </message>
+  </context>
+  <context>
+    <name>InitramfsJob</name>
+    <message>
+      <location filename="../src/modules/initramfs/InitramfsJob.cpp" line="28"/>
+      <source>Creating initramfs.</source>
+      <translation>Đang tạo initramfs.</translation>
+    </message>
+  </context>
+  <context>
+    <name>InteractiveTerminalPage</name>
+    <message>
+      <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="44"/>
+      <source>Konsole not installed</source>
+      <translation>Konsole chưa được cài đặt</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="44"/>
+      <source>Please install KDE Konsole and try again!</source>
+      <translation>Vui lòng cài đặt KDE Konsole rồi thử lại!</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/interactiveterminal/InteractiveTerminalPage.cpp" line="102"/>
+      <source>Executing script: &amp;nbsp;&lt;code&gt;%1&lt;/code&gt;</source>
+      <translation>Đang thực thi kịch bản: &amp;nbsp;&lt;code&gt;%1&lt;/code&gt;</translation>
+    </message>
+  </context>
+  <context>
+    <name>InteractiveTerminalViewStep</name>
+    <message>
+      <location filename="../src/modules/interactiveterminal/InteractiveTerminalViewStep.cpp" line="41"/>
+      <source>Script</source>
+      <translation>Kịch bản</translation>
+    </message>
+  </context>
+  <context>
+    <name>KeyboardPage</name>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="204"/>
+      <source>Set keyboard model to %1.&lt;br/&gt;</source>
+      <translation>Thiết lập bàn phím kiểu %1.&lt;br/&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
+      <source>Set keyboard layout to %1/%2.</source>
+      <translation>Thiết lập bố cục bàn phím thành %1/%2.</translation>
+    </message>
+  </context>
+  <context>
+    <name>KeyboardQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/keyboardq/KeyboardQmlViewStep.cpp" line="33"/>
+      <source>Keyboard</source>
+      <translation>Bàn phím</translation>
+    </message>
+  </context>
+  <context>
+    <name>KeyboardViewStep</name>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardViewStep.cpp" line="45"/>
+      <source>Keyboard</source>
+      <translation>Bàn phím</translation>
+    </message>
+  </context>
+  <context>
+    <name>LCLocaleDialog</name>
+    <message>
+      <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="23"/>
+      <source>System locale setting</source>
+      <translation>Cài đặt ngôn ngữ hệ thống</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="30"/>
+      <source>The system locale setting affects the language and character set for some command line user interface elements.&lt;br/&gt;The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Thiết lập ngôn ngữ hệ thống ảnh hưởng tới ngôn ngữ và bộ kí tự của một vài thành phần trong giao diện dòng lệnh cho người dùng.&lt;br/&gt;Thiết lập hiện tại là &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="54"/>
+      <source>&amp;Cancel</source>
+      <translation>&amp;Huỷ bỏ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LCLocaleDialog.cpp" line="55"/>
+      <source>&amp;OK</source>
+      <translation>&amp;OK</translation>
+    </message>
+  </context>
+  <context>
+    <name>LicensePage</name>
+    <message>
+      <location filename="../src/modules/license/LicensePage.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.ui" line="26"/>
+      <source>&lt;h1&gt;License Agreement&lt;/h1&gt;</source>
+      <translation>&lt;h1&gt;Điều khoản giấy phép&lt;/h1&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="136"/>
+      <source>I accept the terms and conditions above.</source>
+      <translation>Tôi đồng ý với điều khoản và điều kiện trên.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="138"/>
+      <source>Please review the End User License Agreements (EULAs).</source>
+      <translation>Vui lòng đọc thoả thuận giấy phép người dùng cuối (EULAs).</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="143"/>
+      <source>This setup procedure will install proprietary software that is subject to licensing terms.</source>
+      <translation>Quy trình thiết lập này sẽ cài đặt phần mềm độc quyền tuân theo các điều khoản cấp phép.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="146"/>
+      <source>If you do not agree with the terms, the setup procedure cannot continue.</source>
+      <translation>Nếu bạn không đồng ý với các điều khoản, quy trình thiết lập không thể tiếp tục.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="151"/>
+      <source>This setup procedure can install proprietary software that is subject to licensing terms in order to provide additional features and enhance the user experience.</source>
+      <translation>Quy trình thiết lập này có thể cài đặt phần mềm độc quyền tuân theo các điều khoản cấp phép để cung cấp các tính năng bổ sung và nâng cao trải nghiệm người dùng.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicensePage.cpp" line="156"/>
+      <source>If you do not agree with the terms, proprietary software will not be installed, and open source alternatives will be used instead.</source>
+      <translation>Nếu bạn không đồng ý với các điều khoản, phần mềm độc quyền sẽ không được cài đặt và các giải pháp thay thế nguồn mở sẽ được sử dụng thay thế.</translation>
+    </message>
+  </context>
+  <context>
+    <name>LicenseViewStep</name>
+    <message>
+      <location filename="../src/modules/license/LicenseViewStep.cpp" line="43"/>
+      <source>License</source>
+      <translation>Giấy phép</translation>
+    </message>
+  </context>
+  <context>
+    <name>LicenseWidget</name>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="87"/>
+      <source>URL: %1</source>
+      <translation>URL: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="108"/>
+      <source>&lt;strong&gt;%1 driver&lt;/strong&gt;&lt;br/&gt;by %2</source>
+      <extracomment>%1 is an untranslatable product name, example: Creative Audigy driver</extracomment>
+      <translation>&lt;strong&gt;trình điều khiển %1&lt;/strong&gt;&lt;br/&gt;bởi %2</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="115"/>
+      <source>&lt;strong&gt;%1 graphics driver&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <extracomment>%1 is usually a vendor name, example: Nvidia graphics driver</extracomment>
+      <translation>&lt;strong&gt;trình điều khiển đồ hoạc %1&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;bởi %2&lt;/font&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="121"/>
+      <source>&lt;strong&gt;%1 browser plugin&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <translation>&lt;strong&gt;plugin trình duyệt %1&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;bởi %2&lt;/font&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="127"/>
+      <source>&lt;strong&gt;%1 codec&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <translation>&lt;strong&gt;%1 codec&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;bởi %2&lt;/font&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="133"/>
+      <source>&lt;strong&gt;%1 package&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <translation>&lt;strong&gt;gói %1&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;bởi %2&lt;/font&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="139"/>
+      <source>&lt;strong&gt;%1&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
+      <translation>&lt;strong&gt;%1&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;bởi %2&lt;/font&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="162"/>
+      <source>File: %1</source>
+      <translation>Tệp: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="185"/>
+      <source>Hide license text</source>
+      <translation>Ẩn thông tin giấy phép</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="185"/>
+      <source>Show the license text</source>
+      <translation>Hiện thông tin giấy phép</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="189"/>
+      <source>Open license agreement in browser.</source>
+      <translation>Mở điều khoản giấy phép trên trình duyệt.</translation>
+    </message>
+  </context>
+  <context>
+    <name>LocalePage</name>
+    <message>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="124"/>
+      <source>Region:</source>
+      <translation>Khu vực:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="125"/>
+      <source>Zone:</source>
+      <translation>Vùng:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="126"/>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="127"/>
+      <source>&amp;Change...</source>
+      <translation>&amp;Thay đổi...</translation>
+    </message>
+  </context>
+  <context>
+    <name>LocaleQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/localeq/LocaleQmlViewStep.cpp" line="32"/>
+      <source>Location</source>
+      <translation>Vị trí</translation>
+    </message>
+  </context>
+  <context>
+    <name>LocaleViewStep</name>
+    <message>
+      <location filename="../src/modules/locale/LocaleViewStep.cpp" line="76"/>
+      <source>Location</source>
+      <translation>Vị trí</translation>
+    </message>
+  </context>
+  <context>
+    <name>LuksBootKeyFileJob</name>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="28"/>
+      <source>Configuring LUKS key file.</source>
+      <translation>Định cấu hình tệp khóa LUKS.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="145"/>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="153"/>
+      <source>No partitions are defined.</source>
+      <translation>Không có phân vùng nào được xác định.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="181"/>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="188"/>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="196"/>
+      <source>Encrypted rootfs setup error</source>
+      <translation>Lỗi thiết lập rootfs mã hóa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="182"/>
+      <source>Root partition %1 is LUKS but no passphrase has been set.</source>
+      <translation>Phân vùng gốc %1 là LUKS nhưng không có cụm mật khẩu nào được đặt.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="189"/>
+      <source>Could not create LUKS key file for root partition %1.</source>
+      <translation>Không thể tạo tệp khóa LUKS cho phân vùng gốc %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/luksbootkeyfile/LuksBootKeyFileJob.cpp" line="197"/>
+      <source>Could not configure LUKS key file on partition %1.</source>
+      <translation>Không thể định cấu hình tệp khóa LUKS trên phân vùng %1.</translation>
+    </message>
+  </context>
+  <context>
+    <name>MachineIdJob</name>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="37"/>
+      <source>Generate machine-id.</source>
+      <translation>Tạo ID máy.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="53"/>
+      <source>Configuration Error</source>
+      <translation>Lỗi cấu hình</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="54"/>
+      <source>No root mount point is set for MachineId.</source>
+      <translation>Không có điểm gắn kết gốc nào được đặt cho ID máy</translation>
+    </message>
+  </context>
+  <context>
+    <name>Map</name>
+    <message>
+      <location filename="../src/modules/localeq/Map.qml" line="243"/>
+      <source>Timezone: %1</source>
+      <translation>Múi giờ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Map.qml" line="264"/>
+      <source>Please select your preferred location on the map so the installer can suggest the locale
+            and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging
+            to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.</source>
+      <translation>Vui lòng chọn vị trí ưa thích của bạn trên bản đồ để trình cài đặt có thể đề xuất ngôn ngữ
+            và cài đặt múi giờ cho bạn. Bạn có thể tinh chỉnh các cài đặt được đề xuất bên dưới. Tìm kiếm bản đồ bằng cách kéo
+            để di chuyển và sử dụng các nút +/- để phóng to / thu nhỏ hoặc sử dụng cuộn chuột để phóng to.</translation>
+    </message>
+  </context>
+  <context>
+    <name>NetInstallViewStep</name>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="47"/>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="54"/>
+      <source>Package selection</source>
+      <translation>Chọn phân vùng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="55"/>
+      <source>Office software</source>
+      <translation>Phần mềm văn phòng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="56"/>
+      <source>Office package</source>
+      <translation>Gói văn phòng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="57"/>
+      <source>Browser software</source>
+      <translation>Phần mềm trình duyệt</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="58"/>
+      <source>Browser package</source>
+      <translation>Gói trình duyệt</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="59"/>
+      <source>Web browser</source>
+      <translation>Trình duyệt web</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="60"/>
+      <source>Kernel</source>
+      <translation>Lõi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="61"/>
+      <source>Services</source>
+      <translation>Dịch vụ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="62"/>
+      <source>Login</source>
+      <translation>Đăng nhập</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="63"/>
+      <source>Desktop</source>
+      <translation>Màn hình chính</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="64"/>
+      <source>Applications</source>
+      <translation>Ứng dụng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="65"/>
+      <source>Communication</source>
+      <translation>Cộng đồng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="66"/>
+      <source>Development</source>
+      <translation>Phát triển</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="67"/>
+      <source>Office</source>
+      <translation>Văn phòng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="68"/>
+      <source>Multimedia</source>
+      <translation>Đa phương tiện</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="69"/>
+      <source>Internet</source>
+      <translation>Mạng Internet</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="70"/>
+      <source>Theming</source>
+      <translation>Chủ đề</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="71"/>
+      <source>Gaming</source>
+      <translation>Trò chơi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/NetInstallViewStep.cpp" line="72"/>
+      <source>Utilities</source>
+      <translation>Tiện ích</translation>
+    </message>
+  </context>
+  <context>
+    <name>NotesQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/notesqml/NotesQmlViewStep.cpp" line="23"/>
+      <source>Notes</source>
+      <translation>Ghi chú</translation>
+    </message>
+  </context>
+  <context>
+    <name>OEMPage</name>
+    <message>
+      <location filename="../src/modules/oemid/OEMPage.ui" line="32"/>
+      <source>Ba&amp;tch:</source>
+      <translation>&amp;Lô:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/OEMPage.ui" line="42"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Enter a batch-identifier here. This will be stored in the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt; &lt;p&gt; Nhập số nhận dạng lô tại đây. Điều này sẽ được lưu trữ trong hệ thống đích. &lt;/p&gt; &lt;/body&gt; &lt;/html&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/OEMPage.ui" line="52"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;h1&gt;OEM Configuration&lt;/h1&gt;&lt;p&gt;Calamares will use OEM settings while configuring the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt; &lt;h1&gt; Cấu hình OEM &lt;/h1&gt; &lt;p&gt; Calamares sẽ sử dụng cài đặt OEM trong khi định cấu hình hệ thống đích. &lt;/p&gt; &lt;/body&gt; &lt;/html&gt;</translation>
+    </message>
+  </context>
+  <context>
+    <name>OEMViewStep</name>
+    <message>
+      <location filename="../src/modules/oemid/OEMViewStep.cpp" line="122"/>
+      <source>OEM Configuration</source>
+      <translation>Cấu hình OEM</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/oemid/OEMViewStep.cpp" line="128"/>
+      <source>Set the OEM Batch Identifier to &lt;code&gt;%1&lt;/code&gt;.</source>
+      <translation>Đặt số nhận dạng lô OEM thành &lt;code&gt; %1 &lt;/code&gt;.</translation>
+    </message>
+  </context>
+  <context>
+    <name>Offline</name>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="37"/>
+      <source>Select your preferred Region, or use the default one based on your current location.</source>
+      <translation>Chọn khu vực ưa thích của bạn hoặc sử dụng khu vực mặc định dựa trên vị trí hiện tại của bạn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="94"/>
+      <location filename="../src/modules/localeq/Offline.qml" line="169"/>
+      <location filename="../src/modules/localeq/Offline.qml" line="213"/>
+      <source>Timezone: %1</source>
+      <translation>Múi giờ: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="111"/>
+      <source>Select your preferred Zone within your Region.</source>
+      <translation>Chọn vùng ưa thích của bạn trong khu vực của bạn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="182"/>
+      <source>Zones</source>
+      <translation>Vùng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/Offline.qml" line="229"/>
+      <source>You can fine-tune Language and Locale settings below.</source>
+      <translation>Bạn có thể tinh chỉnh cài đặt Ngôn ngữ và Bản địa bên dưới.</translation>
+    </message>
+  </context>
+  <context>
+    <name>PWQ</name>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="51"/>
+      <source>Password is too short</source>
+      <translation>Mật khẩu quá ngắn</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="67"/>
+      <source>Password is too long</source>
+      <translation>Mật khẩu quá dài</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="143"/>
+      <source>Password is too weak</source>
+      <translation>Mật khẩu quá yếu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="151"/>
+      <source>Memory allocation error when setting '%1'</source>
+      <translation>Lỗi phân bổ bộ nhớ khi cài đặt '%1'</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="156"/>
+      <source>Memory allocation error</source>
+      <translation>Lỗi phân bổ bộ nhớ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="158"/>
+      <source>The password is the same as the old one</source>
+      <translation>Mật khẩu giống với mật khẩu cũ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="160"/>
+      <source>The password is a palindrome</source>
+      <translation>Mật khẩu là chuỗi đối xứng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="162"/>
+      <source>The password differs with case changes only</source>
+      <translation>Mật khẩu chỉ khác khi thay đổi chữ hoa chữ thường</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="164"/>
+      <source>The password is too similar to the old one</source>
+      <translation>Mật khẩu giống mật khẩu cũ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="166"/>
+      <source>The password contains the user name in some form</source>
+      <translation>Mật khẩu chứa tên người dùng ở một số dạng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="168"/>
+      <source>The password contains words from the real name of the user in some form</source>
+      <translation>Mật khẩu chứa các từ từ tên thật của người dùng dưới một số hình thức</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="171"/>
+      <source>The password contains forbidden words in some form</source>
+      <translation>Mật khẩu chứa các từ bị cấm dưới một số hình thức</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="175"/>
+      <source>The password contains less than %1 digits</source>
+      <translation>Mật khẩu chứa ít hơn %1 ký tự</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="178"/>
+      <source>The password contains too few digits</source>
+      <translation>Mật khẩu chứa quá ít ký tự</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="182"/>
+      <source>The password contains less than %1 uppercase letters</source>
+      <translation>Mật khẩu có ít nhất %1 chữ viết hoa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="185"/>
+      <source>The password contains too few uppercase letters</source>
+      <translation>Mật khẩu chứa quá ít chữ hoa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="189"/>
+      <source>The password contains less than %1 lowercase letters</source>
+      <translation>Mật khẩu chứa ít hơn %1 chữ thường</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/>
+      <source>The password contains too few lowercase letters</source>
+      <translation>Mật khẩu chứa quá ít chữ thường</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
+      <source>The password contains less than %1 non-alphanumeric characters</source>
+      <translation>Mật khẩu chứa ít hơn %1 ký tự không phải chữ và số</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="200"/>
+      <source>The password contains too few non-alphanumeric characters</source>
+      <translation>Mật khẩu chứa quá ít ký tự không phải chữ và số</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="204"/>
+      <source>The password is shorter than %1 characters</source>
+      <translation>Mật khẩu ngắn hơn %1 ký tự</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="207"/>
+      <source>The password is too short</source>
+      <translation>Mật khẩu quá ngắn</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="209"/>
+      <source>The password is just rotated old one</source>
+      <translation>Mật khẩu vừa được xoay vòng cũ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/>
+      <source>The password contains less than %1 character classes</source>
+      <translation>Mật khẩu chứa ít hơn %1 lớp ký tự</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="216"/>
+      <source>The password does not contain enough character classes</source>
+      <translation>Mật khẩu không chứa đủ các lớp ký tự</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/>
+      <source>The password contains more than %1 same characters consecutively</source>
+      <translation>Mật khẩu chứa nhiều hơn %1 ký tự giống nhau liên tiếp</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="224"/>
+      <source>The password contains too many same characters consecutively</source>
+      <translation>Mật khẩu chứa quá nhiều ký tự giống nhau liên tiếp</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="228"/>
+      <source>The password contains more than %1 characters of the same class consecutively</source>
+      <translation>Mật khẩu chứa nhiều hơn %1 ký tự của cùng một lớp liên tiếp</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="232"/>
+      <source>The password contains too many characters of the same class consecutively</source>
+      <translation>Mật khẩu chứa quá nhiều ký tự của cùng một lớp liên tiếp</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="237"/>
+      <source>The password contains monotonic sequence longer than %1 characters</source>
+      <translation>Mật khẩu chứa chuỗi đơn điệu dài hơn %1 ký tự</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="241"/>
+      <source>The password contains too long of a monotonic character sequence</source>
+      <translation>Mật khẩu chứa một chuỗi ký tự đơn điệu quá dài</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="244"/>
+      <source>No password supplied</source>
+      <translation>Chưa cung cấp mật khẩu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="246"/>
+      <source>Cannot obtain random numbers from the RNG device</source>
+      <translation>Không thể lấy số ngẫu nhiên từ thiết bị RNG</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="248"/>
+      <source>Password generation failed - required entropy too low for settings</source>
+      <translation>Tạo mật khẩu không thành công - yêu cầu entropy quá thấp để cài đặt</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="254"/>
+      <source>The password fails the dictionary check - %1</source>
+      <translation>Mật khẩu không kiểm tra được từ điển - %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="257"/>
+      <source>The password fails the dictionary check</source>
+      <translation>Mật khẩu không kiểm tra được từ điển</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="261"/>
+      <source>Unknown setting - %1</source>
+      <translation>Cài đặt không xác định - %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/>
+      <source>Unknown setting</source>
+      <translation>Cài đặt không xác định</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="269"/>
+      <source>Bad integer value of setting - %1</source>
+      <translation>Giá trị số nguyên không hợp lệ của cài đặt - %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="274"/>
+      <source>Bad integer value</source>
+      <translation>Giá trị số nguyên không hợp lệ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="278"/>
+      <source>Setting %1 is not of integer type</source>
+      <translation>Cài đặt %1 không thuộc kiểu số nguyên</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="283"/>
+      <source>Setting is not of integer type</source>
+      <translation>Cài đặt không thuộc kiểu số nguyên</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="287"/>
+      <source>Setting %1 is not of string type</source>
+      <translation>Cài đặt %1 không thuộc loại chuỗi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="292"/>
+      <source>Setting is not of string type</source>
+      <translation>Cài đặt không thuộc loại chuỗi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="294"/>
+      <source>Opening the configuration file failed</source>
+      <translation>Không mở được tệp cấu hình</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="296"/>
+      <source>The configuration file is malformed</source>
+      <translation>Tệp cấu hình không đúng định dạng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="298"/>
+      <source>Fatal failure</source>
+      <translation>Thất bại nghiêm trọng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="300"/>
+      <source>Unknown error</source>
+      <translation>Lỗi không xác định</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/Config.cpp" line="651"/>
+      <source>Password is empty</source>
+      <translation>Mật khẩu trống</translation>
+    </message>
+  </context>
+  <context>
+    <name>PackageChooserPage</name>
+    <message>
+      <location filename="../src/modules/packagechooser/page_package.ui" line="24"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/page_package.ui" line="44"/>
+      <source>Product Name</source>
+      <translation>Tên sản phẩm</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/page_package.ui" line="57"/>
+      <source>TextLabel</source>
+      <translation>Nhãn văn bản</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/page_package.ui" line="73"/>
+      <source>Long Product Description</source>
+      <translation>Mô tả đầy đủ sản phẩm</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="25"/>
+      <source>Package Selection</source>
+      <translation>Lựa chọn gói</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/PackageChooserPage.cpp" line="26"/>
+      <source>Please pick a product from the list. The selected product will be installed.</source>
+      <translation>Vui lòng chọn một sản phẩm từ danh sách. Sản phẩm đã chọn sẽ được cài đặt.</translation>
+    </message>
+  </context>
+  <context>
+    <name>PackageChooserViewStep</name>
+    <message>
+      <location filename="../src/modules/packagechooser/PackageChooserViewStep.cpp" line="61"/>
+      <source>Packages</source>
+      <translation>Gói</translation>
+    </message>
+  </context>
+  <context>
+    <name>PackageModel</name>
+    <message>
+      <location filename="../src/modules/netinstall/PackageModel.cpp" line="168"/>
+      <source>Name</source>
+      <translation>Tên</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/netinstall/PackageModel.cpp" line="168"/>
+      <source>Description</source>
+      <translation>Mô tả</translation>
+    </message>
+  </context>
+  <context>
+    <name>Page_Keyboard</name>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardPage.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardPage.ui" line="74"/>
+      <source>Keyboard Model:</source>
+      <translation>Mẫu bàn phím:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/KeyboardPage.ui" line="135"/>
+      <source>Type here to test your keyboard</source>
+      <translation>Gõ vào đây để thử bàn phím</translation>
+    </message>
+  </context>
+  <context>
+    <name>Page_UserSetup</name>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="18"/>
+      <source>Form</source>
+      <translation>Mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="40"/>
+      <source>What is your name?</source>
+      <translation>Hãy cho Vigo biết tên đầy đủ của bạn?</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="55"/>
+      <source>Your Full Name</source>
+      <translation>Tên đầy đủ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="124"/>
+      <source>What name do you want to use to log in?</source>
+      <translation>Bạn sẽ dùng tên nào để đăng nhập vào máy tính?</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="148"/>
+      <source>login</source>
+      <translation>Tên đăng nhập</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="223"/>
+      <source>What is the name of this computer?</source>
+      <translation>Tên máy tính này là?</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="247"/>
+      <source>&lt;small&gt;This name will be used if you make the computer visible to others on a network.&lt;/small&gt;</source>
+      <translation>&lt;small&gt;Tên này được dùng nếu máy tính được nhìn thấy trong mạng.&lt;/small&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="250"/>
+      <source>Computer Name</source>
+      <translation>Tên máy</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="325"/>
+      <source>Choose a password to keep your account safe.</source>
+      <translation>Chọn một mật khẩu để giữ an toàn cho tài khoản của bạn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="349"/>
+      <location filename="../src/modules/users/page_usersetup.ui" line="374"/>
+      <source>&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;</source>
+      <translation>&lt;small&gt;Nhập mật khẩu hai lần giống nhau để kiểm tra nếu gõ sai.Một mật khẩu tốt được kết hợp giữ ký tự, số và ký tự đặc biệt; ít nhất 8 ký tự và nên được thay đổi định kỳ.&lt;/small&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="355"/>
+      <location filename="../src/modules/users/page_usersetup.ui" line="525"/>
+      <source>Password</source>
+      <translation>Mật khẩu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="380"/>
+      <location filename="../src/modules/users/page_usersetup.ui" line="550"/>
+      <source>Repeat Password</source>
+      <translation>Nhập lại mật khẩu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="455"/>
+      <source>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</source>
+      <translation>Khi chọn mục này, bạn có thể chọn mật khẩu yếu.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="458"/>
+      <source>Require strong passwords.</source>
+      <translation>Yêu cầu mật khẩu mạnh.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="465"/>
+      <source>Log in automatically without asking for the password.</source>
+      <translation>Tự đăng nhật không cần mật khẩu.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="472"/>
+      <source>Use the same password for the administrator account.</source>
+      <translation>Dùng cùng một mật khẩu cho tài khoản quản trị.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="495"/>
+      <source>Choose a password for the administrator account.</source>
+      <translation>Chọn một mật khẩu cho tài khoản quản trị.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/page_usersetup.ui" line="519"/>
+      <location filename="../src/modules/users/page_usersetup.ui" line="544"/>
+      <source>&lt;small&gt;Enter the same password twice, so that it can be checked for typing errors.&lt;/small&gt;</source>
+      <translation>&lt;small&gt;Nhập mật khẩu hai lần giống nhau để kiểm tra nếu gõ sai.&lt;/small&gt;</translation>
+    </message>
+  </context>
+  <context>
+    <name>PartitionLabelsView</name>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="190"/>
+      <source>Root</source>
+      <translation>Gốc</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="194"/>
+      <source>Home</source>
+      <translation>Nhà</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="198"/>
+      <source>Boot</source>
+      <translation>Khởi động</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="203"/>
+      <source>EFI system</source>
+      <translation>Hệ thống EFI</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="207"/>
+      <source>Swap</source>
+      <translation>Hoán đổi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="211"/>
+      <source>New partition for %1</source>
+      <translation>Phân vùng mới cho %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="215"/>
+      <source>New partition</source>
+      <translation>Phân vùng mới</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="239"/>
+      <source>%1  %2</source>
+      <extracomment>size[number] filesystem[name]</extracomment>
+      <translation>%1  %2</translation>
+    </message>
+  </context>
+  <context>
+    <name>PartitionModel</name>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="159"/>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="199"/>
+      <source>Free Space</source>
+      <translation>Không gian trống</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="163"/>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="203"/>
+      <source>New partition</source>
+      <translation>Phân vùng mới</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="296"/>
+      <source>Name</source>
+      <translation>Tên</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="298"/>
+      <source>File System</source>
+      <translation>Tập tin hệ thống</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="300"/>
+      <source>Mount Point</source>
+      <translation>Điểm gắn kết</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/core/PartitionModel.cpp" line="302"/>
+      <source>Size</source>
+      <translation>Kích cỡ</translation>
+    </message>
+  </context>
+  <context>
+    <name>PartitionPage</name>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="26"/>
+      <source>Storage de&amp;vice:</source>
+      <translation>Thiết &amp;bị lưu trữ:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="55"/>
+      <source>&amp;Revert All Changes</source>
+      <translation>&amp;Hoàn tác tất cả thay đổi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="91"/>
+      <source>New Partition &amp;Table</source>
+      <translation>Phân vùng &amp;Bảng mới</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="111"/>
+      <source>Cre&amp;ate</source>
+      <translation>&amp;Tạo</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="118"/>
+      <source>&amp;Edit</source>
+      <translation>&amp;Sửa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="125"/>
+      <source>&amp;Delete</source>
+      <translation>&amp;Xóa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="136"/>
+      <source>New Volume Group</source>
+      <translation>Nhóm ổ đĩa mới</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="143"/>
+      <source>Resize Volume Group</source>
+      <translation>Thay đổi kích thước nhóm ổ đĩa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="150"/>
+      <source>Deactivate Volume Group</source>
+      <translation>Hủy kích hoạt nhóm ổ đĩa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="157"/>
+      <source>Remove Volume Group</source>
+      <translation>Xóa nhóm ổ đĩa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.ui" line="184"/>
+      <source>I&amp;nstall boot loader on:</source>
+      <translation>&amp;Cài đặt bộ tải khởi động trên:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="219"/>
+      <source>Are you sure you want to create a new partition table on %1?</source>
+      <translation>Bạn có chắc chắn muốn tạo một bảng phân vùng mới trên %1 không?</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="254"/>
+      <source>Can not create new partition</source>
+      <translation>Không thể tạo phân vùng mới</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionPage.cpp" line="255"/>
+      <source>The partition table on %1 already has %2 primary partitions, and no more can be added. Please remove one primary partition and add an extended partition, instead.</source>
+      <translation>Bảng phân vùng trên %1 đã có %2 phân vùng chính và không thể thêm được nữa. Vui lòng xóa một phân vùng chính và thêm một phân vùng mở rộng, thay vào đó.</translation>
+    </message>
+  </context>
+  <context>
+    <name>PartitionViewStep</name>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="69"/>
+      <source>Gathering system information...</source>
+      <translation>Thu thập thông tin hệ thống ...</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="124"/>
+      <source>Partitions</source>
+      <translation>Phân vùng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="162"/>
+      <source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system.</source>
+      <translation>Cài đặt %1 &lt;strong&gt; cùng với &lt;/strong&gt; hệ điều hành khác.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
+      <source>&lt;strong&gt;Erase&lt;/strong&gt; disk and install %1.</source>
+      <translation>&lt;strong&gt; Xóa &lt;/strong&gt; đĩa và cài đặt %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="169"/>
+      <source>&lt;strong&gt;Replace&lt;/strong&gt; a partition with %1.</source>
+      <translation>&lt;strong&gt;thay thế&lt;/strong&gt; một phân vùng với %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="173"/>
+      <source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning.</source>
+      <translation>Phân vùng &lt;strong&gt; thủ công &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="186"/>
+      <source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system on disk &lt;strong&gt;%2&lt;/strong&gt; (%3).</source>
+      <translation>Cài đặt %1 &lt;strong&gt; cùng với &lt;/strong&gt; hệ điều hành khác trên đĩa &lt;strong&gt;%2&lt;/strong&gt; (%3).</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="193"/>
+      <source>&lt;strong&gt;Erase&lt;/strong&gt; disk &lt;strong&gt;%2&lt;/strong&gt; (%3) and install %1.</source>
+      <translation>&lt;strong&gt; Xóa &lt;/strong&gt; đĩa &lt;strong&gt;%2 &lt;/strong&gt; (%3) và cài đặt %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="199"/>
+      <source>&lt;strong&gt;Replace&lt;/strong&gt; a partition on disk &lt;strong&gt;%2&lt;/strong&gt; (%3) with %1.</source>
+      <translation>&lt;strong&gt; Thay thế &lt;/strong&gt; phân vùng trên đĩa &lt;strong&gt;%2 &lt;/strong&gt; (%3) bằng %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="206"/>
+      <source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning on disk &lt;strong&gt;%1&lt;/strong&gt; (%2).</source>
+      <translation>Phân vùng &lt;strong&gt; thủ công &lt;/strong&gt; trên đĩa &lt;strong&gt;%1 &lt;/strong&gt; (%2).</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="215"/>
+      <source>Disk &lt;strong&gt;%1&lt;/strong&gt; (%2)</source>
+      <translation>Đĩa &lt;strong&gt;%1&lt;/strong&gt; (%2)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="241"/>
+      <source>Current:</source>
+      <translation>Hiện tại:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="259"/>
+      <source>After:</source>
+      <translation>Sau:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="426"/>
+      <source>No EFI system partition configured</source>
+      <translation>Không có hệ thống phân vùng EFI được cài đặt</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="427"/>
+      <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;%3&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</source>
+      <translation>Cần có phân vùng hệ thống EFI để khởi động %1. &lt;br/&gt; &lt;br/&gt; Để định cấu hình phân vùng hệ thống EFI, hãy quay lại và chọn hoặc tạo hệ thống tệp FAT32 với cờ &lt;strong&gt; %3 &lt;/strong&gt; được bật và gắn kết point &lt;strong&gt; %2 &lt;/strong&gt;. &lt;br/&gt; &lt;br/&gt; Bạn có thể tiếp tục mà không cần thiết lập phân vùng hệ thống EFI nhưng hệ thống của bạn có thể không khởi động được.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="441"/>
+      <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;%3&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</source>
+      <translation>Một phân vùng hệ thống EFI là cần thiết để bắt đầu %1. &lt;br/&gt; &lt;br/&gt; Một phân vùng đã được định cấu hình với điểm gắn kết &lt;strong&gt; %2 &lt;/strong&gt; nhưng cờ &lt;strong&gt; %3 &lt;/strong&gt; của nó không được đặt . &lt;br/&gt; Để đặt cờ, hãy quay lại và chỉnh sửa phân vùng. &lt;br/&gt; &lt;br/&gt; Bạn có thể tiếp tục mà không cần đặt cờ nhưng hệ thống của bạn có thể không khởi động được.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="440"/>
+      <source>EFI system partition flag not set</source>
+      <translation>Cờ phân vùng hệ thống EFI chưa được đặt</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="467"/>
+      <source>Option to use GPT on BIOS</source>
+      <translation>Lựa chọn dùng GPT trên BIOS</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="468"/>
+      <source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
+      <translation>Bảng phân vùng GPT là lựa chọn tốt nhất cho tất cả các hệ thống. Trình cài đặt này cũng hỗ trợ thiết lập như vậy cho các hệ thống BIOS. &lt;br/&gt; &lt;br/&gt; Để định cấu hình bảng phân vùng GPT trên BIOS, (nếu chưa thực hiện xong) hãy quay lại và đặt bảng phân vùng thành GPT, tiếp theo tạo 8 MB phân vùng chưa định dạng với cờ &lt;strong&gt; bios_grub &lt;/strong&gt; được bật. &lt;br/&gt; &lt;br/&gt; Cần có phân vùng 8 MB chưa được định dạng để khởi động %1 trên hệ thống BIOS có GPT.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="496"/>
+      <source>Boot partition not encrypted</source>
+      <translation>Phân vùng khởi động không được mã hóa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="497"/>
+      <source>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</source>
+      <translation>Một phân vùng khởi động riêng biệt đã được thiết lập cùng với một phân vùng gốc được mã hóa, nhưng phân vùng khởi động không được mã hóa. &lt;br/&gt; &lt;br/&gt; Có những lo ngại về bảo mật với loại thiết lập này, vì các tệp hệ thống quan trọng được lưu giữ trên một phân vùng không được mã hóa . &lt;br/&gt; Bạn có thể tiếp tục nếu muốn, nhưng việc mở khóa hệ thống tệp sẽ diễn ra sau trong quá trình khởi động hệ thống. &lt;br/&gt; Để mã hóa phân vùng khởi động, hãy quay lại và tạo lại nó, chọn &lt;strong&gt; Mã hóa &lt;/strong&gt; trong phân vùng cửa sổ tạo.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="626"/>
+      <source>has at least one disk device available.</source>
+      <translation>có sẵn ít nhất một thiết bị đĩa.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="627"/>
+      <source>There are no partitions to install on.</source>
+      <translation>Không có phân vùng để cài đặt.</translation>
+    </message>
+  </context>
+  <context>
+    <name>PlasmaLnfJob</name>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="30"/>
+      <source>Plasma Look-and-Feel Job</source>
+      <translation>Công việc Plasma Look-and-Feel</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="62"/>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfJob.cpp" line="63"/>
+      <source>Could not select KDE Plasma Look-and-Feel package</source>
+      <translation>Không thể chọn gói KDE Plasma Look-and-Feel</translation>
+    </message>
+  </context>
+  <context>
+    <name>PlasmaLnfPage</name>
+    <message>
+      <location filename="../src/modules/plasmalnf/page_plasmalnf.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="61"/>
+      <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is set up. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
+      <translation>Vui lòng chọn giao diện cho Máy tính để bàn KDE Plasma. Bạn cũng có thể bỏ qua bước này và định cấu hình giao diện sau khi hệ thống được thiết lập. Nhấp vào lựa chọn giao diện sẽ cung cấp cho bạn bản xem trước trực tiếp của giao diện đó.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfPage.cpp" line="66"/>
+      <source>Please choose a look-and-feel for the KDE Plasma Desktop. You can also skip this step and configure the look-and-feel once the system is installed. Clicking on a look-and-feel selection will give you a live preview of that look-and-feel.</source>
+      <translation>Vui lòng chọn giao diện cho Máy tính để bàn KDE Plasma. Bạn cũng có thể bỏ qua bước này và định cấu hình giao diện sau khi hệ thống được thiết lập. Nhấp vào lựa chọn giao diện sẽ cung cấp cho bạn bản xem trước trực tiếp của giao diện đó.</translation>
+    </message>
+  </context>
+  <context>
+    <name>PlasmaLnfViewStep</name>
+    <message>
+      <location filename="../src/modules/plasmalnf/PlasmaLnfViewStep.cpp" line="61"/>
+      <source>Look-and-Feel</source>
+      <translation>Look-and-Feel</translation>
+    </message>
+  </context>
+  <context>
+    <name>PreserveFiles</name>
+    <message>
+      <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="79"/>
+      <source>Saving files for later ...</source>
+      <translation>Đang lưu tập tin để dùng sau ...</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="118"/>
+      <source>No files configured to save for later.</source>
+      <translation>Không có tệp nào được định cấu hình để lưu sau này.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/preservefiles/PreserveFiles.cpp" line="172"/>
+      <source>Not all of the configured files could be preserved.</source>
+      <translation>Không phải tất cả các tệp đã định cấu hình đều có thể được giữ nguyên.</translation>
+    </message>
+  </context>
+  <context>
+    <name>ProcessResult</name>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="412"/>
+      <source>
+There was no output from the command.</source>
+      <translation>
+Không có đầu ra từ lệnh.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="413"/>
+      <source>
+Output:
+</source>
+      <translation>
+Đầu ra:
+</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="417"/>
+      <source>External command crashed.</source>
+      <translation>Lệnh bên ngoài bị lỗi.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="418"/>
+      <source>Command &lt;i&gt;%1&lt;/i&gt; crashed.</source>
+      <translation>Lệnh &lt;i&gt;%1&lt;/i&gt; bị lỗi.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="423"/>
+      <source>External command failed to start.</source>
+      <translation>Lệnh ngoài không thể bắt đầu.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="424"/>
+      <source>Command &lt;i&gt;%1&lt;/i&gt; failed to start.</source>
+      <translation>Lệnh &lt;i&gt;%1&lt;/i&gt; không thể bắt đầu.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="428"/>
+      <source>Internal error when starting command.</source>
+      <translation>Lỗi nội bộ khi bắt đầu lệnh.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="429"/>
+      <source>Bad parameters for process job call.</source>
+      <translation>Tham số không hợp lệ cho lệnh gọi công việc của quy trình.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="433"/>
+      <source>External command failed to finish.</source>
+      <translation>Không thể hoàn tất lệnh bên ngoài.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="434"/>
+      <source>Command &lt;i&gt;%1&lt;/i&gt; failed to finish in %2 seconds.</source>
+      <translation>Lệnh &lt;i&gt;%1&lt;/i&gt; không thể hoàn thành trong %2 giây.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="441"/>
+      <source>External command finished with errors.</source>
+      <translation>Lệnh bên ngoài kết thúc với lỗi.</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/utils/CalamaresUtilsSystem.cpp" line="442"/>
+      <source>Command &lt;i&gt;%1&lt;/i&gt; finished with exit code %2.</source>
+      <translation>Lệnh &lt;i&gt;%1&lt;/i&gt; hoàn thành với lỗi %2.</translation>
+    </message>
+  </context>
+  <context>
+    <name>QObject</name>
+    <message>
+      <location filename="../src/libcalamares/locale/Label.cpp" line="29"/>
+      <source>%1 (%2)</source>
+      <translation>%1 (%2)</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/partition/FileSystem.cpp" line="28"/>
+      <source>unknown</source>
+      <translation>không xác định</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/partition/FileSystem.cpp" line="30"/>
+      <source>extended</source>
+      <translation>gia tăng</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/partition/FileSystem.cpp" line="32"/>
+      <source>unformatted</source>
+      <translation>không định dạng</translation>
+    </message>
+    <message>
+      <location filename="../src/libcalamares/partition/FileSystem.cpp" line="34"/>
+      <source>swap</source>
+      <translation>hoán đổi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="90"/>
+      <source>Default Keyboard Model</source>
+      <translation>Mẫu bàn phím mặc định</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="136"/>
+      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="173"/>
+      <source>Default</source>
+      <translation>Mặc định</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/Workers.cpp" line="64"/>
+      <location filename="../src/modules/machineid/Workers.cpp" line="72"/>
+      <location filename="../src/modules/machineid/Workers.cpp" line="76"/>
+      <location filename="../src/modules/machineid/Workers.cpp" line="93"/>
+      <source>File not found</source>
+      <translation>Không tìm thấy tập tin</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/Workers.cpp" line="65"/>
+      <source>Path &lt;pre&gt;%1&lt;/pre&gt; must be an absolute path.</source>
+      <translation>Đường dẫn &lt;pre&gt;%1&lt;/pre&gt; phải là đường dẫn tuyệt đối.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
+      <source>Directory not found</source>
+      <translation>Thư mục không tìm thấy</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
+      <location filename="../src/modules/machineid/Workers.cpp" line="94"/>
+      <source>Could not create new random file &lt;pre&gt;%1&lt;/pre&gt;.</source>
+      <translation>Không thể tạo tập tin ngẫu nhiên &lt;pre&gt;%1&lt;/pre&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/PackageModel.cpp" line="70"/>
+      <source>No product</source>
+      <translation>Không có sản phẩm</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/packagechooser/PackageModel.cpp" line="78"/>
+      <source>No description provided.</source>
+      <translation>Không có mô tả được cung cấp.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionDialogHelpers.cpp" line="40"/>
+      <source>(no mount point)</source>
+      <translation>(không có điểm gắn kết)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/PartitionLabelsView.cpp" line="41"/>
+      <source>Unpartitioned space or unknown partition table</source>
+      <translation>Không gian chưa được phân vùng hoặc bảng phân vùng không xác định</translation>
+    </message>
+  </context>
+  <context>
+    <name>Recommended</name>
+    <message>
+      <location filename="../src/modules/welcomeq/Recommended.qml" line="40"/>
+      <source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
+        Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
+      <translation>&lt;p&gt; Máy tính này không đáp ứng một số yêu cầu được đề xuất để thiết lập %1. &lt;br/&gt;
+        Có thể tiếp tục thiết lập nhưng một số tính năng có thể bị tắt. &lt;/p&gt;</translation>
+    </message>
+  </context>
+  <context>
+    <name>RemoveUserJob</name>
+    <message>
+      <location filename="../src/modules/removeuser/RemoveUserJob.cpp" line="34"/>
+      <source>Remove live user from target system</source>
+      <translation>Xóa người dùng trực tiếp khỏi hệ thống đích</translation>
+    </message>
+  </context>
+  <context>
+    <name>RemoveVolumeGroupJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="24"/>
+      <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="36"/>
+      <source>Remove Volume Group named %1.</source>
+      <translation>Xóa nhóm ổ đĩa có tên %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="30"/>
+      <source>Remove Volume Group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Xóa nhóm ổ đĩa có tên &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/RemoveVolumeGroupJob.cpp" line="48"/>
+      <source>The installer failed to remove a volume group named '%1'.</source>
+      <translation>Trình cài đặt không xóa được nhóm ổ đĩa có tên '%1'.</translation>
+    </message>
+  </context>
+  <context>
+    <name>ReplaceWidget</name>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="127"/>
+      <source>Select where to install %1.&lt;br/&gt;&lt;font color="red"&gt;Warning: &lt;/font&gt;this will delete all files on the selected partition.</source>
+      <translation>Chọn nơi cài đặt %1. &lt;br/&gt; &lt;font color = "red"&gt; Cảnh báo: &lt;/font&gt; điều này sẽ xóa tất cả các tệp trên phân vùng đã chọn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="149"/>
+      <source>The selected item does not appear to be a valid partition.</source>
+      <translation>Mục đã chọn dường như không phải là một phân vùng hợp lệ.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="157"/>
+      <source>%1 cannot be installed on empty space. Please select an existing partition.</source>
+      <translation>%1 không thể được cài đặt trên không gian trống. Vui lòng chọn một phân vùng hiện có.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="167"/>
+      <source>%1 cannot be installed on an extended partition. Please select an existing primary or logical partition.</source>
+      <translation>%1 không thể được cài đặt trên một phân vùng mở rộng. Vui lòng chọn phân vùng chính hoặc phân vùng logic hiện có.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="177"/>
+      <source>%1 cannot be installed on this partition.</source>
+      <translation>%1 không thể cài đặt trên phân vùng này.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="183"/>
+      <source>Data partition (%1)</source>
+      <translation>Phân vùng dữ liệu (%1)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="203"/>
+      <source>Unknown system partition (%1)</source>
+      <translation>Phân vùng hệ thống không xác định (%1)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="207"/>
+      <source>%1 system partition (%2)</source>
+      <translation>%1 phân vùng hệ thống (%2)</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="218"/>
+      <source>&lt;strong&gt;%4&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;The partition %1 is too small for %2. Please select a partition with capacity at least %3 GiB.</source>
+      <translation>&lt;strong&gt; %4 &lt;/strong&gt; &lt;br/&gt; &lt;br/&gt; Phân vùng %1 quá nhỏ đối với %2. Vui lòng chọn một phân vùng có dung lượng ít nhất là %3 GiB.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="240"/>
+      <source>&lt;strong&gt;%2&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
+      <translation>&lt;strong&gt; %2 &lt;/strong&gt; &lt;br/&gt; &lt;br/&gt; Không thể tìm thấy phân vùng hệ thống EFI ở bất kỳ đâu trên hệ thống này. Vui lòng quay lại và sử dụng phân vùng thủ công để thiết lập %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="251"/>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="267"/>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="292"/>
+      <source>&lt;strong&gt;%3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;%1 will be installed on %2.&lt;br/&gt;&lt;font color="red"&gt;Warning: &lt;/font&gt;all data on partition %2 will be lost.</source>
+      <translation>&lt;strong&gt; %3 &lt;/strong&gt; &lt;br/&gt; &lt;br/&gt; %1 sẽ được cài đặt trên %2. &lt;br/&gt; &lt;font color = "red"&gt; Cảnh báo: &lt;/font&gt; tất cả dữ liệu trên phân vùng %2 sẽ bị mất.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="259"/>
+      <source>The EFI system partition at %1 will be used for starting %2.</source>
+      <translation>Phân vùng hệ thống EFI tại %1 sẽ được sử dụng để bắt đầu %2.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ReplaceWidget.cpp" line="275"/>
+      <source>EFI system partition:</source>
+      <translation>Phân vùng hệ thống EFI:</translation>
+    </message>
+  </context>
+  <context>
+    <name>Requirements</name>
+    <message>
+      <location filename="../src/modules/welcomeq/Requirements.qml" line="38"/>
+      <source>&lt;p&gt;This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;
+        Installation cannot continue.&lt;/p&gt;</source>
+      <translation>&lt;p&gt; Máy tính này không đáp ứng các yêu cầu tối thiểu để cài đặt %1. &lt;br/&gt;
+        Không thể tiếp tục cài đặt. &lt;/p&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/Requirements.qml" line="40"/>
+      <source>&lt;p&gt;This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;
+        Setup can continue, but some features might be disabled.&lt;/p&gt;</source>
+      <translation>&lt;p&gt; Máy tính này không đáp ứng một số yêu cầu được đề xuất để thiết lập %1. &lt;br/&gt;
+        Có thể tiếp tục thiết lập nhưng một số tính năng có thể bị tắt. &lt;/p&gt;</translation>
+    </message>
+  </context>
+  <context>
+    <name>ResizeFSJob</name>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="46"/>
+      <source>Resize Filesystem Job</source>
+      <translation>Thay đổi kích thước tệp công việc hệ thống</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="169"/>
+      <source>Invalid configuration</source>
+      <translation>Cấu hình không hợp lệ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="170"/>
+      <source>The file-system resize job has an invalid configuration and will not run.</source>
+      <translation>Công việc thay đổi kích thước hệ thống tệp có cấu hình không hợp lệ và sẽ không chạy.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="175"/>
+      <source>KPMCore not Available</source>
+      <translation>KPMCore không khả dụng</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="176"/>
+      <source>Calamares cannot start KPMCore for the file-system resize job.</source>
+      <translation>Calamares không thể khởi động KPMCore cho công việc thay đổi kích thước hệ thống tệp.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="184"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="193"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="204"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="213"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="231"/>
+      <source>Resize Failed</source>
+      <translation>Thay đổi kích thước không thành công</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="186"/>
+      <source>The filesystem %1 could not be found in this system, and cannot be resized.</source>
+      <translation>Không thể tìm thấy tệp hệ thống %1 trong hệ thống này và không thể thay đổi kích thước.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/>
+      <source>The device %1 could not be found in this system, and cannot be resized.</source>
+      <translation>Không thể tìm thấy thiết bị %1 trong hệ thống này và không thể thay đổi kích thước.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="195"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="206"/>
+      <source>The filesystem %1 cannot be resized.</source>
+      <translation>Không thể thay đổi kích thước tệp hệ thống %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="196"/>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="207"/>
+      <source>The device %1 cannot be resized.</source>
+      <translation>Không thể thay đổi kích thước thiết bị %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="214"/>
+      <source>The filesystem %1 must be resized, but cannot.</source>
+      <translation>Hệ thống tệp %1 phải được thay đổi kích thước, nhưng không thể.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="215"/>
+      <source>The device %1 must be resized, but cannot</source>
+      <translation>Thiết bị %1 phải được thay đổi kích thước, nhưng không thể</translation>
+    </message>
+  </context>
+  <context>
+    <name>ResizePartitionJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="40"/>
+      <source>Resize partition %1.</source>
+      <translation>Đổi kích thước phân vùng %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="47"/>
+      <source>Resize &lt;strong&gt;%2MiB&lt;/strong&gt; partition &lt;strong&gt;%1&lt;/strong&gt; to &lt;strong&gt;%3MiB&lt;/strong&gt;.</source>
+      <translation>Thay đổi kích thước &lt;strong&gt;%2MiB&lt;/strong&gt; phân vùng &lt;strong&gt;%1&lt;/strong&gt; toùng &lt;strong&gt;%3đếnMiB&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="58"/>
+      <source>Resizing %2MiB partition %1 to %3MiB.</source>
+      <translation>Thay đổi %2MiB phân vùng %1 thành %3MiB.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizePartitionJob.cpp" line="77"/>
+      <source>The installer failed to resize partition %1 on disk '%2'.</source>
+      <translation>Thất bại trong việc thay đổi kích thước phân vùng %1 trên đĩa '%2'.</translation>
+    </message>
+  </context>
+  <context>
+    <name>ResizeVolumeGroupDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/ResizeVolumeGroupDialog.cpp" line="30"/>
+      <source>Resize Volume Group</source>
+      <translation>Thay đổi kích thước nhóm ổ đĩa</translation>
+    </message>
+  </context>
+  <context>
+    <name>ResizeVolumeGroupJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="27"/>
+      <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="45"/>
+      <source>Resize volume group named %1 from %2 to %3.</source>
+      <translation>Thay đổi kích thước nhóm ổ đĩa có tên %1 từ %2 thành %3.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="36"/>
+      <source>Resize volume group named &lt;strong&gt;%1&lt;/strong&gt; from &lt;strong&gt;%2&lt;/strong&gt; to &lt;strong&gt;%3&lt;/strong&gt;.</source>
+      <translation>Thay đổi kích thước nhóm ổ đĩa có tên &lt;strong&gt; %1 &lt;/strong&gt; từ &lt;strong&gt; %2 &lt;/strong&gt; thành &lt;strong&gt; %3 &lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/ResizeVolumeGroupJob.cpp" line="60"/>
+      <source>The installer failed to resize a volume group named '%1'.</source>
+      <translation>Trình cài đặt không thể thay đổi kích thước một nhóm ổ đĩa có tên ' %1'.</translation>
+    </message>
+  </context>
+  <context>
+    <name>ResultsListDialog</name>
+    <message>
+      <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="133"/>
+      <source>For best results, please ensure that this computer:</source>
+      <translation>Để có kết quả tốt nhất, hãy đảm bảo rằng máy tính này:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="134"/>
+      <source>System requirements</source>
+      <translation>Yêu cầu hệ thống</translation>
+    </message>
+  </context>
+  <context>
+    <name>ResultsListWidget</name>
+    <message>
+      <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="256"/>
+      <source>This computer does not satisfy the minimum requirements for setting up %1.&lt;br/&gt;Setup cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
+      <translation>Máy tính này không đáp ứng các yêu cầu tối thiểu để thiết lập %1. &lt;br/&gt; Không thể tiếp tục thiết lập. &lt;a href="#details"&gt; Chi tiết ... &lt;/a&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="260"/>
+      <source>This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;Installation cannot continue. &lt;a href="#details"&gt;Details...&lt;/a&gt;</source>
+      <translation>Máy tính này không đáp ứng các yêu cầu tối thiểu để cài đặt %1. &lt;br/&gt; Không thể tiếp tục cài đặt. &lt;a href="#details"&gt; Chi tiết ... &lt;/a&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="267"/>
+      <source>This computer does not satisfy some of the recommended requirements for setting up %1.&lt;br/&gt;Setup can continue, but some features might be disabled.</source>
+      <translation>Máy tính này không đáp ứng một số yêu cầu được khuyến nghị để thiết lập %1. &lt;br/&gt; Quá trình thiết lập có thể tiếp tục nhưng một số tính năng có thể bị tắt.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="271"/>
+      <source>This computer does not satisfy some of the recommended requirements for installing %1.&lt;br/&gt;Installation can continue, but some features might be disabled.</source>
+      <translation>Máy tính này không đáp ứng một số yêu cầu được khuyến nghị để cài đặt %1. &lt;br/&gt; Quá trình cài đặt có thể tiếp tục, nhưng một số tính năng có thể bị tắt.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/checker/ResultsListWidget.cpp" line="280"/>
+      <source>This program will ask you some questions and set up %2 on your computer.</source>
+      <translation>Chương trình này sẽ hỏi bạn một số câu hỏi và thiết lập %2 trên máy tính của bạn.</translation>
+    </message>
+  </context>
+  <context>
+    <name>ScanningDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="64"/>
+      <source>Scanning storage devices...</source>
+      <translation>Quét thiết bị lưu trữ...</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/ScanningDialog.cpp" line="64"/>
+      <source>Partitioning</source>
+      <translation>Đang phân vùng</translation>
+    </message>
+  </context>
+  <context>
+    <name>SetHostNameJob</name>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="37"/>
+      <source>Set hostname %1</source>
+      <translation>Đặt tên máy %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="44"/>
+      <source>Set hostname &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Đặt tên máy &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="51"/>
+      <source>Setting hostname %1.</source>
+      <translation>Đặt tên máy %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="122"/>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="129"/>
+      <source>Internal Error</source>
+      <translation>Lỗi bên trong</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="137"/>
+      <location filename="../src/modules/users/SetHostNameJob.cpp" line="146"/>
+      <source>Cannot write hostname to target system</source>
+      <translation>Không thể ghi tên máy chủ vào hệ thống đích</translation>
+    </message>
+  </context>
+  <context>
+    <name>SetKeyboardLayoutJob</name>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="53"/>
+      <source>Set keyboard model to %1, layout to %2-%3</source>
+      <translation>Cài đặt bàn phím kiểu %1, bố cục %2-%3</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="356"/>
+      <source>Failed to write keyboard configuration for the virtual console.</source>
+      <translation>Lỗi khi ghi cấu hình bàn phím cho virtual console.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="357"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="361"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="368"/>
+      <source>Failed to write to %1</source>
+      <translation>Lỗi khi ghi vào %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="360"/>
+      <source>Failed to write keyboard configuration for X11.</source>
+      <translation>Lỗi khi ghi cấu hình bàn phím cho X11.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="367"/>
+      <source>Failed to write keyboard configuration to existing /etc/default directory.</source>
+      <translation>Lỗi khi ghi cấu hình bàn phím vào thư mục /etc/default.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SetPartFlagsJob</name>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="43"/>
+      <source>Set flags on partition %1.</source>
+      <translation>Chọn cờ trong phân vùng %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="49"/>
+      <source>Set flags on %1MiB %2 partition.</source>
+      <translation>Chọn cờ %1MiB %2 phân vùng.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="53"/>
+      <source>Set flags on new partition.</source>
+      <translation>Chọn cờ trong phân vùng mới.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="65"/>
+      <source>Clear flags on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Xóa cờ trong phân vùng&lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="71"/>
+      <source>Clear flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
+      <translation>Xóa cờ trong %1MiB &lt;strong&gt;%2&lt;/strong&gt; phân vùng.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="75"/>
+      <source>Clear flags on new partition.</source>
+      <translation>Xóa cờ trong phân vùng mới.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="80"/>
+      <source>Flag partition &lt;strong&gt;%1&lt;/strong&gt; as &lt;strong&gt;%2&lt;/strong&gt;.</source>
+      <translation>Cờ phân vùng &lt;strong&gt;%1&lt;/strong&gt; như &lt;strong&gt;%2&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="89"/>
+      <source>Flag %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition as &lt;strong&gt;%3&lt;/strong&gt;.</source>
+      <translation>Cờ %1MiB &lt;strong&gt;%2&lt;/strong&gt; phân vùng như &lt;strong&gt;%3&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="96"/>
+      <source>Flag new partition as &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Cờ phân vùng mới như &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="108"/>
+      <source>Clearing flags on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Đang xóa cờ trên phân vùng &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="114"/>
+      <source>Clearing flags on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
+      <translation>Đang xóa cờ trên %1MiB &lt;strong&gt;%2&lt;/strong&gt; phân vùng.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="119"/>
+      <source>Clearing flags on new partition.</source>
+      <translation>Đang xóa cờ trên phân vùng mới.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="124"/>
+      <source>Setting flags &lt;strong&gt;%2&lt;/strong&gt; on partition &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>Chọn cờ &lt;strong&gt;%2&lt;/strong&gt; trong phân vùng &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="133"/>
+      <source>Setting flags &lt;strong&gt;%3&lt;/strong&gt; on %1MiB &lt;strong&gt;%2&lt;/strong&gt; partition.</source>
+      <translation>Chọn cờ &lt;strong&gt;%3&lt;/strong&gt; trong %1MiB &lt;strong&gt;%2&lt;/strong&gt; phân vùng.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="140"/>
+      <source>Setting flags &lt;strong&gt;%1&lt;/strong&gt; on new partition.</source>
+      <translation>Chọn cờ &lt;strong&gt;%1&lt;/strong&gt; trong phân vùng mới.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="156"/>
+      <source>The installer failed to set flags on partition %1.</source>
+      <translation>Không thể tạo cờ cho phân vùng %1.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SetPasswordJob</name>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="40"/>
+      <source>Set password for user %1</source>
+      <translation>Tạo mật khẩu người dùng %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="47"/>
+      <source>Setting password for user %1.</source>
+      <translation>Đang tạo mật khẩu người dùng %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="81"/>
+      <source>Bad destination system path.</source>
+      <translation>Đường dẫn hệ thống đích không hợp lệ.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="82"/>
+      <source>rootMountPoint is %1</source>
+      <translation>Điểm gắn kết gốc là %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="88"/>
+      <source>Cannot disable root account.</source>
+      <translation>Không thể vô hiệu hoá tài khoản quản trị.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="89"/>
+      <source>passwd terminated with error code %1.</source>
+      <translation>passwd bị kết thúc với mã lỗi %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="97"/>
+      <source>Cannot set password for user %1.</source>
+      <translation>Không thể đặt mật khẩu cho người dùng %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/SetPasswordJob.cpp" line="98"/>
+      <source>usermod terminated with error code %1.</source>
+      <translation>usermod bị chấm dứt với mã lỗi %1.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SetTimezoneJob</name>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="34"/>
+      <source>Set timezone to %1/%2</source>
+      <translation>Đặt múi giờ thành %1/%2</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="62"/>
+      <source>Cannot access selected timezone path.</source>
+      <translation>Không thể truy cập đường dẫn múi giờ đã chọn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="63"/>
+      <source>Bad path: %1</source>
+      <translation>Đường dẫn sai: %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="71"/>
+      <source>Cannot set timezone.</source>
+      <translation>Không thể cài đặt múi giờ.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="72"/>
+      <source>Link creation failed, target: %1; link name: %2</source>
+      <translation>Không tạo được liên kết, target: %1; tên liên kết: %2</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="77"/>
+      <source>Cannot set timezone,</source>
+      <translation>Không thể cài đặt múi giờ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/locale/SetTimezoneJob.cpp" line="78"/>
+      <source>Cannot open /etc/timezone for writing</source>
+      <translation>Không thể mở để viết vào /etc/timezone</translation>
+    </message>
+  </context>
+  <context>
+    <name>ShellProcessJob</name>
+    <message>
+      <location filename="../src/modules/shellprocess/ShellProcessJob.cpp" line="41"/>
+      <source>Shell Processes Job</source>
+      <translation>Shell Xử lý Công việc</translation>
+    </message>
+  </context>
+  <context>
+    <name>SlideCounter</name>
+    <message>
+      <location filename="../src/qml/calamares/slideshow/SlideCounter.qml" line="27"/>
+      <source>%L1 / %L2</source>
+      <extracomment>slide counter, %1 of %2 (numeric)</extracomment>
+      <translation>%L1 / %L2</translation>
+    </message>
+  </context>
+  <context>
+    <name>SummaryPage</name>
+    <message>
+      <location filename="../src/modules/summary/SummaryPage.cpp" line="47"/>
+      <source>This is an overview of what will happen once you start the setup procedure.</source>
+      <translation>Đây là tổng quan về những gì sẽ xảy ra khi bạn bắt đầu quy trình thiết lập.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/summary/SummaryPage.cpp" line="49"/>
+      <source>This is an overview of what will happen once you start the install procedure.</source>
+      <translation>Đây là tổng quan về những gì sẽ xảy ra khi bạn bắt đầu quy trình cài đặt.</translation>
+    </message>
+  </context>
+  <context>
+    <name>SummaryViewStep</name>
+    <message>
+      <location filename="../src/modules/summary/SummaryViewStep.cpp" line="36"/>
+      <source>Summary</source>
+      <translation>Tổng quan</translation>
+    </message>
+  </context>
+  <context>
+    <name>TrackingInstallJob</name>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="37"/>
+      <source>Installation feedback</source>
+      <translation>Phản hồi cài đặt</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="43"/>
+      <source>Sending installation feedback.</source>
+      <translation>Gửi phản hồi cài đặt.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="60"/>
+      <source>Internal error in install-tracking.</source>
+      <translation>Lỗi nội bộ trong theo dõi cài đặt.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="61"/>
+      <source>HTTP request timed out.</source>
+      <translation>Yêu cầu HTTP đã hết thời gian chờ.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TrackingKUserFeedbackJob</name>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="122"/>
+      <source>KDE user feedback</source>
+      <translation>Người dùng KDE phản hồi</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="128"/>
+      <source>Configuring KDE user feedback.</source>
+      <translation>Định cấu hình phản hồi của người dùng KDE.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="150"/>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="156"/>
+      <source>Error in KDE user feedback configuration.</source>
+      <translation>Lỗi trong cấu hình phản hồi của người dùng KDE.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="151"/>
+      <source>Could not configure KDE user feedback correctly, script error %1.</source>
+      <translation>Không thể định cấu hình phản hồi của người dùng KDE một cách chính xác, lỗi tập lệnh %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="157"/>
+      <source>Could not configure KDE user feedback correctly, Calamares error %1.</source>
+      <translation>Không thể định cấu hình phản hồi của người dùng KDE một cách chính xác, lỗi Calamares %1.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TrackingMachineUpdateManagerJob</name>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="71"/>
+      <source>Machine feedback</source>
+      <translation>Phản hồi máy</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="77"/>
+      <source>Configuring machine feedback.</source>
+      <translation>Cấu hình phản hồi máy.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="100"/>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="106"/>
+      <source>Error in machine feedback configuration.</source>
+      <translation>Lỗi cấu hình phản hồi máy.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="101"/>
+      <source>Could not configure machine feedback correctly, script error %1.</source>
+      <translation>Không thể cấu hình phản hồi máy chính xác, kịch bản lỗi %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingJobs.cpp" line="107"/>
+      <source>Could not configure machine feedback correctly, Calamares error %1.</source>
+      <translation>Không thể cấu hình phản hồi máy chính xác, lỗi %1.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TrackingPage</name>
+    <message>
+      <location filename="../src/modules/tracking/page_trackingstep.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/page_trackingstep.ui" line="28"/>
+      <source>Placeholder</source>
+      <translation>Trình giữ chỗ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/page_trackingstep.ui" line="76"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Click here to send &lt;span style=" font-weight:600;"&gt;no information at all&lt;/span&gt; about your installation.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Nhấp vào đây để gửi &lt;span style=" font-weight:600;"&gt;không có thông tin nào&lt;/span&gt; về cài đặt của bạn.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/page_trackingstep.ui" line="275"/>
+      <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href="placeholder"&gt;&lt;span style=" text-decoration: underline; color:#2980b9;"&gt;Click here for more information about user feedback&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href="placeholder"&gt;&lt;span style=" text-decoration: underline; color:#2980b9;"&gt;Bấm vào đây để biết thêm thông tin về phản hồi của người dùng&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingPage.cpp" line="86"/>
+      <source>Tracking helps %1 to see how often it is installed, what hardware it is installed on and which applications are used. To see what will be sent, please click the help icon next to each area.</source>
+      <translation>Theo dõi giúp %1 biết tần suất cài đặt, phần cứng được cài đặt trên phần cứng nào và ứng dụng nào được sử dụng. Để xem những gì sẽ được gửi, vui lòng nhấp vào biểu tượng trợ giúp bên cạnh mỗi khu vực.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingPage.cpp" line="91"/>
+      <source>By selecting this you will send information about your installation and hardware. This information will only be sent &lt;b&gt;once&lt;/b&gt; after the installation finishes.</source>
+      <translation>Bằng cách chọn này, bạn sẽ gửi thông tin về cài đặt và phần cứng của mình. Thông tin này sẽ chỉ được gửi &lt;b&gt; một lần &lt;/b&gt; sau khi quá trình cài đặt kết thúc.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingPage.cpp" line="94"/>
+      <source>By selecting this you will periodically send information about your &lt;b&gt;machine&lt;/b&gt; installation, hardware and applications, to %1.</source>
+      <translation>Bằng cách chọn này, bạn sẽ định kỳ gửi thông tin về cài đặt &lt;b&gt; máy &lt;/b&gt;, phần cứng và ứng dụng của mình cho %1.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/tracking/TrackingPage.cpp" line="98"/>
+      <source>By selecting this you will regularly send information about your &lt;b&gt;user&lt;/b&gt; installation, hardware, applications and application usage patterns, to %1.</source>
+      <translation>Bằng cách chọn này, bạn sẽ thường xuyên gửi thông tin về cài đặt &lt;b&gt; người dùng &lt;/b&gt;, phần cứng, ứng dụng và các kiểu sử dụng ứng dụng cho %1.</translation>
+    </message>
+  </context>
+  <context>
+    <name>TrackingViewStep</name>
+    <message>
+      <location filename="../src/modules/tracking/TrackingViewStep.cpp" line="49"/>
+      <source>Feedback</source>
+      <translation>Phản hồi</translation>
+    </message>
+  </context>
+  <context>
+    <name>UsersPage</name>
+    <message>
+      <location filename="../src/modules/users/UsersPage.cpp" line="156"/>
+      <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after setup.&lt;/small&gt;</source>
+      <translation>&lt;small&gt; Nếu nhiều người cùng sử dụng máy tính này, bạn có thể tạo nhiều tài khoản sau khi thiết lập. &lt;/small&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/UsersPage.cpp" line="162"/>
+      <source>&lt;small&gt;If more than one person will use this computer, you can create multiple accounts after installation.&lt;/small&gt;</source>
+      <translation>&lt;small&gt; Nếu nhiều người cùng sử dụng máy tính này, bạn có thể tạo nhiều tài khoản sau khi cài đặt. &lt;/small&gt;</translation>
+    </message>
+  </context>
+  <context>
+    <name>UsersQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/usersq/UsersQmlViewStep.cpp" line="39"/>
+      <source>Users</source>
+      <translation>Người dùng</translation>
+    </message>
+  </context>
+  <context>
+    <name>UsersViewStep</name>
+    <message>
+      <location filename="../src/modules/users/UsersViewStep.cpp" line="48"/>
+      <source>Users</source>
+      <translation>Người dùng</translation>
+    </message>
+  </context>
+  <context>
+    <name>VariantModel</name>
+    <message>
+      <location filename="../src/calamares/VariantModel.cpp" line="232"/>
+      <source>Key</source>
+      <comment>Column header for key/value</comment>
+      <translation>Khóa</translation>
+    </message>
+    <message>
+      <location filename="../src/calamares/VariantModel.cpp" line="236"/>
+      <source>Value</source>
+      <comment>Column header for key/value</comment>
+      <translation>Giá trị</translation>
+    </message>
+  </context>
+  <context>
+    <name>VolumeGroupBaseDialog</name>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="18"/>
+      <source>Create Volume Group</source>
+      <translation>Tạo nhóm ổ đĩa</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="24"/>
+      <source>List of Physical Volumes</source>
+      <translation>Danh sách các đĩa vật lý</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="34"/>
+      <source>Volume Group Name:</source>
+      <translation>Tên nhóm ổ đĩa:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="47"/>
+      <source>Volume Group Type:</source>
+      <translation>Loại nhóm ổ đĩa:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="60"/>
+      <source>Physical Extent Size:</source>
+      <translation>Kích thước phạm vi vật lý:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="70"/>
+      <source> MiB</source>
+      <translation> MiB</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="86"/>
+      <source>Total Size:</source>
+      <translation>Tổng kích thước:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="106"/>
+      <source>Used Size:</source>
+      <translation>Đã dùng:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="126"/>
+      <source>Total Sectors:</source>
+      <translation>Tổng số Sec-tơ:</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/partition/gui/VolumeGroupBaseDialog.ui" line="146"/>
+      <source>Quantity of LVs:</source>
+      <translation>Số lượng của LVs:</translation>
+    </message>
+  </context>
+  <context>
+    <name>WelcomePage</name>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="18"/>
+      <source>Form</source>
+      <translation>Biểu mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="79"/>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="98"/>
+      <source>Select application and system language</source>
+      <translation>Chọn ngôn ngữ ứng dụng và hệ thống</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="140"/>
+      <source>&amp;About</source>
+      <translation>&amp;Giới thiệu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="150"/>
+      <source>Open donations website</source>
+      <translation>Mở trang web ủng hộ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="153"/>
+      <source>&amp;Donate</source>
+      <translation>Ủng &amp;hộ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="163"/>
+      <source>Open help and support website</source>
+      <translation>Mở trang web trợ giúp</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="166"/>
+      <source>&amp;Support</source>
+      <translation>&amp;Hỗ trợ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="176"/>
+      <source>Open issues and bug-tracking website</source>
+      <translation>Mở trang web theo dõi lỗi và vấn đề</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="179"/>
+      <source>&amp;Known issues</source>
+      <translation>&amp;Vấn đề đã biết</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="189"/>
+      <source>Open release notes website</source>
+      <translation>Mở trang web ghi chú phát hành</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.ui" line="192"/>
+      <source>&amp;Release notes</source>
+      <translation>&amp;Ghi chú phát hành</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
+      <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
+      <translation>&lt;h1&gt;Chào mừng đến với chương trình Calamares để thiết lập cho %1.&lt;/h1&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="217"/>
+      <source>&lt;h1&gt;Welcome to %1 setup.&lt;/h1&gt;</source>
+      <translation>&lt;h1&gt;Chào mừng đến với thiết lập %1.&lt;/h1&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="222"/>
+      <source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
+      <translation>&lt;h1&gt;Chào mừng đến với chương trình Calamares để cài đặt cho %1.&lt;/h1&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
+      <source>&lt;h1&gt;Welcome to the %1 installer.&lt;/h1&gt;</source>
+      <translation>&lt;h1&gt;Chào mừng đến với bộ cài đặt %1.&lt;/h1&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="228"/>
+      <source>%1 support</source>
+      <translation>Hỗ trợ %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="235"/>
+      <source>About %1 setup</source>
+      <translation>Về thiết lập %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="235"/>
+      <source>About %1 installer</source>
+      <translation>Về bộ cài đặt %1</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcome/WelcomePage.cpp" line="238"/>
+      <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Thanks to &lt;a href="https://calamares.io/team/"&gt;the Calamares team&lt;/a&gt; and the &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;Calamares translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; development is sponsored by &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</source>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;&lt;strong&gt;%2&lt;br/&gt;cho %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;Bản quyền 2014-2017 bởi Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;Bản quyền 2017-2020 bởi Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;Cám ơn &lt;a href="https://calamares.io/team/"&gt;đội ngũ Calamares&lt;/a&gt; và &lt;a href="https://www.transifex.com/calamares/calamares/"&gt;các dịch giả của Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;&lt;a href="https://calamares.io/"&gt;Calamares&lt;/a&gt; được tài trợ bởi &lt;br/&gt;&lt;a href="http://www.blue-systems.com/"&gt;Blue Systems&lt;/a&gt; - Liberating Software.</translation>
+    </message>
+  </context>
+  <context>
+    <name>WelcomeQmlViewStep</name>
+    <message>
+      <location filename="../src/modules/welcomeq/WelcomeQmlViewStep.cpp" line="41"/>
+      <source>Welcome</source>
+      <translation>Chào mừng</translation>
+    </message>
+  </context>
+  <context>
+    <name>WelcomeViewStep</name>
+    <message>
+      <location filename="../src/modules/welcome/WelcomeViewStep.cpp" line="48"/>
+      <source>Welcome</source>
+      <translation>Chào mừng</translation>
+    </message>
+  </context>
+  <context>
+    <name>about</name>
+    <message>
+      <location filename="../src/modules/welcomeq/about.qml" line="47"/>
+      <source>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
+                        &lt;strong&gt;%2&lt;br/&gt;
+                        for %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
+                        Copyright 2014-2017 Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;
+                        Copyright 2017-2020 Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;
+                        Thanks to &lt;a href='https://calamares.io/team/'&gt;the Calamares team&lt;/a&gt;
+                        and the &lt;a href='https://www.transifex.com/calamares/calamares/'&gt;Calamares
+                        translators team&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;
+                        &lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt;
+                        development is sponsored by &lt;br/&gt;
+                        &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
+                        Liberating Software.</source>
+      <translation>&lt;h1&gt;%1&lt;/h1&gt;&lt;br/&gt;
+                        &lt;strong&gt;%2&lt;br/&gt;
+                        cho %3&lt;/strong&gt;&lt;br/&gt;&lt;br/&gt;
+                        Bản quyền 2014-2017 bởi Teo Mrnjavac &amp;lt;teo@kde.org&amp;gt;&lt;br/&gt;
+                        Bản quyền 2017-2020 bởi Adriaan de Groot &amp;lt;groot@kde.org&amp;gt;&lt;br/&gt;
+                        Cám ơn &lt;a href='https://calamares.io/team/'&gt;đội ngũ Calamares&lt;/a&gt;
+                        và &lt;a href='https://www.transifex.com/calamares/calamares/'&gt;các dịch giả Calamares&lt;/a&gt;.&lt;br/&gt;&lt;br/&gt;
+                        &lt;a href='https://calamares.io/'&gt;Calamares&lt;/a&gt;
+                        được tài trợ bởi &lt;br/&gt;
+                        &lt;a href='http://www.blue-systems.com/'&gt;Blue Systems&lt;/a&gt; -
+                        Liberating Software.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/about.qml" line="96"/>
+      <source>Back</source>
+      <translation>Quay lại</translation>
+    </message>
+  </context>
+  <context>
+    <name>i18n</name>
+    <message>
+      <location filename="../src/modules/localeq/i18n.qml" line="46"/>
+      <source>&lt;h1&gt;Languages&lt;/h1&gt; &lt;/br&gt;
+                    The system locale setting affects the language and character set for some command line user interface elements. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>&lt;h1&gt;Ngôn ngữ&lt;/h1&gt; &lt;/br&gt;
+                    Cài đặt ngôn ngữ hệ thống ảnh hưởng đến ngôn ngữ và bộ ký tự cho một số thành phần giao diện người dùng dòng lệnh. Cài đặt hiện tại là &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/i18n.qml" line="106"/>
+      <source>&lt;h1&gt;Locales&lt;/h1&gt; &lt;/br&gt;
+                    The system locale setting affects the numbers and dates format. The current setting is &lt;strong&gt;%1&lt;/strong&gt;.</source>
+      <translation>&lt;h1&gt;Địa phương&lt;/h1&gt; &lt;/br&gt;
+                    Cài đặt ngôn ngữ hệ thống ảnh hưởng đến số và định dạng ngày tháng. Cài đặt hiện tại là &lt;strong&gt;%1&lt;/strong&gt;.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/localeq/i18n.qml" line="158"/>
+      <source>Back</source>
+      <translation>Trở lại</translation>
+    </message>
+  </context>
+  <context>
+    <name>keyboardq</name>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="45"/>
+      <source>Keyboard Model</source>
+      <translation>Mẫu bàn phím</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="377"/>
+      <source>Layouts</source>
+      <translation>Bố cục</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="148"/>
+      <source>Keyboard Layout</source>
+      <translation>Bố cục bàn phím</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
+      <source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
+      <translation>Nhấp vào kiểu bàn phím ưa thích của bạn để chọn bố cục và biến thể hoặc sử dụng kiểu mặc định dựa trên phần cứng được phát hiện.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
+      <source>Models</source>
+      <translation>Mẫu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="260"/>
+      <source>Variants</source>
+      <translation>Các biến thể</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
+      <source>Keyboard Variant</source>
+      <translation>Các biến thể bàn phím</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
+      <source>Test your keyboard</source>
+      <translation>Thử bàn phím</translation>
+    </message>
+  </context>
+  <context>
+    <name>localeq</name>
+    <message>
+      <location filename="../src/modules/localeq/localeq.qml" line="81"/>
+      <source>Change</source>
+      <translation>Đổi</translation>
+    </message>
+  </context>
+  <context>
+    <name>notesqml</name>
+    <message>
+      <location filename="../src/modules/notesqml/notesqml.qml" line="50"/>
+      <source>&lt;h3&gt;%1&lt;/h3&gt;
+            &lt;p&gt;These are example release notes.&lt;/p&gt;</source>
+      <translation>&lt;h3&gt;%1&lt;/h3&gt;
+            &lt;p&gt;Đây là ghi chú phát hành mẫu.&lt;/p&gt;</translation>
+    </message>
+  </context>
+  <context>
+    <name>release_notes</name>
+    <message>
+      <location filename="../src/modules/welcomeq/release_notes.qml" line="45"/>
+      <source>&lt;h3&gt;%1&lt;/h3&gt;
+            &lt;p&gt;This an example QML file, showing options in RichText with Flickable content.&lt;/p&gt;
+
+            &lt;p&gt;QML with RichText can use HTML tags, Flickable content is useful for touchscreens.&lt;/p&gt;
+
+            &lt;p&gt;&lt;b&gt;This is bold text&lt;/b&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;i&gt;This is italic text&lt;/i&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;u&gt;This is underlined text&lt;/u&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;center&gt;This text will be center-aligned.&lt;/center&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;s&gt;This is strikethrough&lt;/s&gt;&lt;/p&gt;
+
+            &lt;p&gt;Code example:
+            &lt;code&gt;ls -l /home&lt;/code&gt;&lt;/p&gt;
+
+            &lt;p&gt;&lt;b&gt;Lists:&lt;/b&gt;&lt;/p&gt;
+            &lt;ul&gt;
+                &lt;li&gt;Intel CPU systems&lt;/li&gt;
+                &lt;li&gt;AMD CPU systems&lt;/li&gt;
+            &lt;/ul&gt;
+
+            &lt;p&gt;The vertical scrollbar is adjustable, current width set to 10.&lt;/p&gt;</source>
+      <translation>&lt;h3&gt;%1&lt;/h3&gt;
+            &lt;p&gt;Đây là một tệp QML mẫu, hiển thị các tùy chọn trong RichText với nội dung Flickable..&lt;/p&gt;
+
+            &lt;p&gt;QML với RichText có thể sử dụng thẻ HTML, nội dung Flickable hữu ích cho màn hình cảm ứng.&lt;/p&gt;
+
+            &lt;p&gt;&lt;b&gt;Đây là văn bản in đậm&lt;/b&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;i&gt;Đây là văn bản in nghiêng&lt;/i&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;u&gt;Đây là văn bản được gạch chân&lt;/u&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;center&gt;Văn bản này sẽ được căn giữa.&lt;/center&gt;&lt;/p&gt;
+            &lt;p&gt;&lt;s&gt;Đây là đường gạch ngang&lt;/s&gt;&lt;/p&gt;
+
+            &lt;p&gt;Ví dụ về mã:
+            &lt;code&gt;ls -l /home&lt;/code&gt;&lt;/p&gt;
+
+            &lt;p&gt;&lt;b&gt;Danh sách:&lt;/b&gt;&lt;/p&gt;
+            &lt;ul&gt;
+                &lt;li&gt;Hệ thống Intel CPU&lt;/li&gt;
+                &lt;li&gt;Hệ thống AMD CPU&lt;/li&gt;
+            &lt;/ul&gt;
+
+            &lt;p&gt;Thanh cuộn dọc có thể điều chỉnh được, chiều rộng hiện tại được đặt thành 10.&lt;/p&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/release_notes.qml" line="76"/>
+      <source>Back</source>
+      <translation>Quay lại</translation>
+    </message>
+  </context>
+  <context>
+    <name>usersq</name>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="36"/>
+      <source>Pick your user name and credentials to login and perform admin tasks</source>
+      <translation>Chọn tên bạn và chứng chỉ để đăng nhập và thực hiện các tác vụ quản trị</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="52"/>
+      <source>What is your name?</source>
+      <translation>Hãy cho Vigo biết tên đầy đủ của bạn?</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="59"/>
+      <source>Your Full Name</source>
+      <translation>Tên đầy đủ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="80"/>
+      <source>What name do you want to use to log in?</source>
+      <translation>Bạn muốn dùng tên nào để đăng nhập máy tính?</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="87"/>
+      <source>Login Name</source>
+      <translation>Tên đăng nhập</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="103"/>
+      <source>If more than one person will use this computer, you can create multiple accounts after installation.</source>
+      <translation>Tạo nhiều tài khoản sau khi cài đặt nếu có nhiều người dùng chung.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="118"/>
+      <source>What is the name of this computer?</source>
+      <translation>Tên của máy tính này là?</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="125"/>
+      <source>Computer Name</source>
+      <translation>Tên máy tính</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="140"/>
+      <source>This name will be used if you make the computer visible to others on a network.</source>
+      <translation>Tên này sẽ hiển thị khi bạn kết nối vào một mạng.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="155"/>
+      <source>Choose a password to keep your account safe.</source>
+      <translation>Chọn mật khẩu để giữ máy tính an toàn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="166"/>
+      <source>Password</source>
+      <translation>Mật khẩu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="185"/>
+      <source>Repeat Password</source>
+      <translation>Lặp lại mật khẩu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="204"/>
+      <source>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.</source>
+      <translation>Nhập lại mật khẩu hai lần để kiểm tra. Một mật khẩu tốt phải có ít nhất 8 ký tự và bao gồm chữ, số, ký hiệu đặc biệt. Nên được thay đổi thường xuyên.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="216"/>
+      <source>Validate passwords quality</source>
+      <translation>Xác thực chất lượng mật khẩu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="226"/>
+      <source>When this box is checked, password-strength checking is done and you will not be able to use a weak password.</source>
+      <translation>Khi tích chọn, bạn có thể chọn mật khẩu yếu.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="234"/>
+      <source>Log in automatically without asking for the password</source>
+      <translation>Tự động đăng nhập không hỏi mật khẩu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="243"/>
+      <source>Reuse user password as root password</source>
+      <translation>Dùng lại mật khẩu người dùng như mật khẩu quản trị</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="253"/>
+      <source>Use the same password for the administrator account.</source>
+      <translation>Dùng cùng một mật khẩu cho tài khoản quản trị.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="268"/>
+      <source>Choose a root password to keep your account safe.</source>
+      <translation>Chọn mật khẩu quản trị để giữ máy tính an toàn.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="279"/>
+      <source>Root Password</source>
+      <translation>Mật khẩu quản trị</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="298"/>
+      <source>Repeat Root Password</source>
+      <translation>Lặp lại mật khẩu quản trị</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/usersq/usersq.qml" line="318"/>
+      <source>Enter the same password twice, so that it can be checked for typing errors.</source>
+      <translation>Nhập lại mật khẩu hai lần để kiểm tra.</translation>
+    </message>
+  </context>
+  <context>
+    <name>welcomeq</name>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="35"/>
+      <source>&lt;h3&gt;Welcome to the %1 &lt;quote&gt;%2&lt;/quote&gt; installer&lt;/h3&gt;
+            &lt;p&gt;This program will ask you some questions and set up %1 on your computer.&lt;/p&gt;</source>
+      <translation>&lt;h3&gt;Chào mừng đến với bộ cài đặt %1 &lt;quote&gt;%2&lt;/quote&gt;&lt;/h3&gt;
+            &lt;p&gt;Chương trình sẽ hỏi bản vài câu hỏi và thiết lập %1 trên máy tính của bạn.&lt;/p&gt;</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
+      <source>About</source>
+      <translation>Giới thiệu</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
+      <source>Support</source>
+      <translation>Hỗ trợ</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="91"/>
+      <source>Known issues</source>
+      <translation>Các vấn đề đã biết</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="102"/>
+      <source>Release notes</source>
+      <translation>Ghi chú phát hành</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/welcomeq/welcomeq.qml" line="114"/>
+      <source>Donate</source>
+      <translation>Ủng hộ</translation>
+    </message>
+  </context>
+</TS>
diff --git a/lang/calamares_zh_TW.ts b/lang/calamares_zh_TW.ts
index fe5918943..85a49ee98 100644
--- a/lang/calamares_zh_TW.ts
+++ b/lang/calamares_zh_TW.ts
@@ -617,17 +617,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>此儲存裝置上已有作業系統，但分割表 &lt;strong&gt;%1&lt;/strong&gt; 與需要的 &lt;strong&gt;%2&lt;/strong&gt; 不同。&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>此裝置&lt;strong&gt;已掛載&lt;/strong&gt;其中一個分割區。</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>此儲存裝置是&lt;strong&gt;非作用中 RAID&lt;/strong&gt; 裝置的一部份。</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>

From 3e57979e735a295a2464ee9ab6fde8b5c2441ed0 Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Thu, 29 Oct 2020 14:28:48 +0100
Subject: [PATCH 105/228] i18n: [desktop] Automatic merge of Transifex
 translations

---
 calamares.desktop | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/calamares.desktop b/calamares.desktop
index b6cafe612..834c4a518 100644
--- a/calamares.desktop
+++ b/calamares.desktop
@@ -201,6 +201,10 @@ Name[uk]=Встановити Систему
 Icon[uk]=calamares
 GenericName[uk]=Встановлювач системи
 Comment[uk]=Calamares - Встановлювач системи
+Name[vi]=Cài đặt hệ thống
+Icon[vi]=calamares
+GenericName[vi]=Bộ cài đặt hệ thống
+Comment[vi]=Calamares — Bộ cài đặt hệ thống
 Name[zh_CN]=安装系统
 Icon[zh_CN]=calamares
 GenericName[zh_CN]=系统安装程序

From f82285644165f342cbf6557d15907cc82dc097d1 Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Thu, 29 Oct 2020 14:28:48 +0100
Subject: [PATCH 106/228] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/be/LC_MESSAGES/python.po    |   6 +-
 lang/python/bg/LC_MESSAGES/python.po    |   4 +-
 lang/python/ca/LC_MESSAGES/python.po    |   2 +
 lang/python/da/LC_MESSAGES/python.po    |   2 +
 lang/python/fi_FI/LC_MESSAGES/python.po |   2 +
 lang/python/fur/LC_MESSAGES/python.po   |   4 +-
 lang/python/hi/LC_MESSAGES/python.po    |   2 +
 lang/python/sv/LC_MESSAGES/python.po    |   2 +
 lang/python/tg/LC_MESSAGES/python.po    |   2 +
 lang/python/vi/LC_MESSAGES/python.po    | 363 ++++++++++++++++++++++++
 lang/python/zh_TW/LC_MESSAGES/python.po |   2 +-
 11 files changed, 384 insertions(+), 7 deletions(-)
 create mode 100644 lang/python/vi/LC_MESSAGES/python.po

diff --git a/lang/python/be/LC_MESSAGES/python.po b/lang/python/be/LC_MESSAGES/python.po
index c31beab74..b9154868b 100644
--- a/lang/python/be/LC_MESSAGES/python.po
+++ b/lang/python/be/LC_MESSAGES/python.po
@@ -201,6 +201,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Спіс дысплейных кіраўнікоў пусты альбо не вызначаны ў both globalstorage і "
+"displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
@@ -314,11 +316,11 @@ msgstr "Наладка апаратнага гадзінніка."
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr ""
+msgstr "Стварэнне initramfs праз mkinitfs."
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr ""
+msgstr "Не атрымалася запусціць mkinitfs у пункце прызначэння"
 
 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
 msgid "The exit code was {}"
diff --git a/lang/python/bg/LC_MESSAGES/python.po b/lang/python/bg/LC_MESSAGES/python.po
index 372847af8..ca58592ad 100644
--- a/lang/python/bg/LC_MESSAGES/python.po
+++ b/lang/python/bg/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Georgi Georgiev, 2020
+# Жоро, 2020
 # 
 #, fuzzy
 msgid ""
@@ -13,7 +13,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-10-16 22:35+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Georgi Georgiev, 2020\n"
+"Last-Translator: Жоро, 2020\n"
 "Language-Team: Bulgarian (https://www.transifex.com/calamares/teams/20061/bg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff --git a/lang/python/ca/LC_MESSAGES/python.po b/lang/python/ca/LC_MESSAGES/python.po
index 3d057cae1..1dc1d6d14 100644
--- a/lang/python/ca/LC_MESSAGES/python.po
+++ b/lang/python/ca/LC_MESSAGES/python.po
@@ -204,6 +204,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"La llista de gestors de pantalla és buida o no definida ni a globalstorage "
+"ni a displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
diff --git a/lang/python/da/LC_MESSAGES/python.po b/lang/python/da/LC_MESSAGES/python.po
index e2603ca82..6a103acbe 100644
--- a/lang/python/da/LC_MESSAGES/python.po
+++ b/lang/python/da/LC_MESSAGES/python.po
@@ -204,6 +204,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Displayhåndteringerlisten er tom eller udefineret i både globalstorage og "
+"displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
diff --git a/lang/python/fi_FI/LC_MESSAGES/python.po b/lang/python/fi_FI/LC_MESSAGES/python.po
index cb15f9ae9..e4e63e57d 100644
--- a/lang/python/fi_FI/LC_MESSAGES/python.po
+++ b/lang/python/fi_FI/LC_MESSAGES/python.po
@@ -201,6 +201,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Luettelo on tyhjä tai määrittelemätön, sekä globalstorage, että "
+"displaymanager.conf tiedostossa."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
diff --git a/lang/python/fur/LC_MESSAGES/python.po b/lang/python/fur/LC_MESSAGES/python.po
index 3168c2f35..90800f4a2 100644
--- a/lang/python/fur/LC_MESSAGES/python.po
+++ b/lang/python/fur/LC_MESSAGES/python.po
@@ -23,11 +23,11 @@ msgstr ""
 
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
-msgstr ""
+msgstr "Configure GRUB."
 
 #: src/modules/mount/main.py:29
 msgid "Mounting partitions."
-msgstr ""
+msgstr "Montaç des partizions."
 
 #: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:196
 #: src/modules/initcpiocfg/main.py:200
diff --git a/lang/python/hi/LC_MESSAGES/python.po b/lang/python/hi/LC_MESSAGES/python.po
index 2b0ab266a..d577d9fd8 100644
--- a/lang/python/hi/LC_MESSAGES/python.po
+++ b/lang/python/hi/LC_MESSAGES/python.po
@@ -200,6 +200,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"globalstorage व displaymanager.conf में डिस्प्ले प्रबंधक सूची रिक्त या "
+"अपरिभाषित है।"
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
diff --git a/lang/python/sv/LC_MESSAGES/python.po b/lang/python/sv/LC_MESSAGES/python.po
index 0b8665e7a..d1c87de4c 100644
--- a/lang/python/sv/LC_MESSAGES/python.po
+++ b/lang/python/sv/LC_MESSAGES/python.po
@@ -205,6 +205,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Skärmhanterar listan är tom eller odefinierad i både globalstorage och "
+"displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
diff --git a/lang/python/tg/LC_MESSAGES/python.po b/lang/python/tg/LC_MESSAGES/python.po
index d99c9e711..d9886a107 100644
--- a/lang/python/tg/LC_MESSAGES/python.po
+++ b/lang/python/tg/LC_MESSAGES/python.po
@@ -205,6 +205,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Рӯйхати displaymanagers ҳам дар globalstorage ва ҳам дар displaymanager.conf"
+" холӣ ё номаълум аст."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
diff --git a/lang/python/vi/LC_MESSAGES/python.po b/lang/python/vi/LC_MESSAGES/python.po
new file mode 100644
index 000000000..bb9b67a96
--- /dev/null
+++ b/lang/python/vi/LC_MESSAGES/python.po
@@ -0,0 +1,363 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# 
+# Translators:
+# T. Tran <transifex@emiu.net>, 2020
+# 
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-10-16 22:35+0200\n"
+"PO-Revision-Date: 2017-08-09 10:34+0000\n"
+"Last-Translator: T. Tran <transifex@emiu.net>, 2020\n"
+"Language-Team: Vietnamese (https://www.transifex.com/calamares/teams/20061/vi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: vi\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: src/modules/grubcfg/main.py:28
+msgid "Configure GRUB."
+msgstr "Cấu hình GRUB"
+
+#: src/modules/mount/main.py:29
+msgid "Mounting partitions."
+msgstr "Đang gắn kết các phân vùng."
+
+#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:196
+#: src/modules/initcpiocfg/main.py:200
+#: src/modules/luksopenswaphookcfg/main.py:86
+#: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
+#: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
+#: src/modules/openrcdmcryptcfg/main.py:69
+#: src/modules/openrcdmcryptcfg/main.py:73 src/modules/fstab/main.py:361
+#: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135
+#: src/modules/networkcfg/main.py:39
+msgid "Configuration Error"
+msgstr "Lỗi cấu hình"
+
+#: src/modules/mount/main.py:142 src/modules/initcpiocfg/main.py:197
+#: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
+#: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:70
+#: src/modules/fstab/main.py:362
+msgid "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr "Không có phân vùng nào được định nghĩa cho <pre>{!s}</pre> để dùng."
+
+#: src/modules/services-systemd/main.py:26
+msgid "Configure systemd services"
+msgstr "Cấu hình các dịch vụ systemd"
+
+#: src/modules/services-systemd/main.py:59
+#: src/modules/services-openrc/main.py:93
+msgid "Cannot modify service"
+msgstr "Không thể sửa đổi dịch vụ"
+
+#: src/modules/services-systemd/main.py:60
+msgid ""
+"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"<code>systemctl {arg!s}</code> trong môi trường chroot trả về lỗi {num!s}."
+
+#: src/modules/services-systemd/main.py:63
+#: src/modules/services-systemd/main.py:67
+msgid "Cannot enable systemd service <code>{name!s}</code>."
+msgstr "Không thể bật dịch vụ systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:65
+msgid "Cannot enable systemd target <code>{name!s}</code>."
+msgstr "Không thể bật nhóm dịch vụ systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:69
+msgid "Cannot disable systemd target <code>{name!s}</code>."
+msgstr "Không thể tắt nhóm dịch vụ systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:71
+msgid "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr "Không thể đánh dấu đơn vị systemd <code>{name!s}</code>."
+
+#: src/modules/services-systemd/main.py:73
+msgid ""
+"Unknown systemd commands <code>{command!s}</code> and "
+"<code>{suffix!s}</code> for unit {name!s}."
+msgstr ""
+"Không nhận ra lệnh systemd <code>{command!s}</code> và "
+"<code>{suffix!s}</code> cho đơn vị {name!s}."
+
+#: src/modules/umount/main.py:31
+msgid "Unmount file systems."
+msgstr "Gỡ kết nối các hệ thống tập tin."
+
+#: src/modules/unpackfs/main.py:35
+msgid "Filling up filesystems."
+msgstr "Đang làm đầy các hệ thống tập tin."
+
+#: src/modules/unpackfs/main.py:254
+msgid "rsync failed with error code {}."
+msgstr "rsync thất bại với lỗi {}."
+
+#: src/modules/unpackfs/main.py:299
+msgid "Unpacking image {}/{}, file {}/{}"
+msgstr "Đang bung hình ảnh {}/{}, tập tin {}/{}"
+
+#: src/modules/unpackfs/main.py:314
+msgid "Starting to unpack {}"
+msgstr "Bắt đầu bung nội dung {}"
+
+#: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:463
+msgid "Failed to unpack image \"{}\""
+msgstr "Bung hình ảnh thất bại \"{}\""
+
+#: src/modules/unpackfs/main.py:430
+msgid "No mount point for root partition"
+msgstr "Không có điểm kết nối cho phân vùng gốc"
+
+#: src/modules/unpackfs/main.py:431
+msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr "globalstorage không có khoá \"rootMountPoint\", sẽ không làm gì cả"
+
+#: src/modules/unpackfs/main.py:436
+msgid "Bad mount point for root partition"
+msgstr "Sai điểm kết nối cho phân vùng gốc"
+
+#: src/modules/unpackfs/main.py:437
+msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr "rootMountPoint không tồn tại, có giá trị là \"{}\", sẽ không làm gì cả"
+
+#: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
+#: src/modules/unpackfs/main.py:477
+msgid "Bad unsquash configuration"
+msgstr "Sai cấu hình bung nén"
+
+#: src/modules/unpackfs/main.py:454
+msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr "Hệ thống tập tin cho \"{}\" ({}) không được hỗ trợ bởi nhân hiện tại"
+
+#: src/modules/unpackfs/main.py:458
+msgid "The source filesystem \"{}\" does not exist"
+msgstr "Hệ thống tập tin nguồn \"{}\" không tồn tại"
+
+#: src/modules/unpackfs/main.py:464
+msgid ""
+"Failed to find unsquashfs, make sure you have the squashfs-tools package "
+"installed"
+msgstr "Không tìm thấy lệnh unsquashfs, vui lòng cài đặt gói squashfs-tools"
+
+#: src/modules/unpackfs/main.py:478
+msgid "The destination \"{}\" in the target system is not a directory"
+msgstr "Hệ thống đích \"{}\" không phải là một thư mục"
+
+#: src/modules/displaymanager/main.py:514
+msgid "Cannot write KDM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình KDM"
+
+#: src/modules/displaymanager/main.py:515
+msgid "KDM config file {!s} does not exist"
+msgstr "Tập tin cấu hình KDM {!s} không tồn tại"
+
+#: src/modules/displaymanager/main.py:576
+msgid "Cannot write LXDM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình LXDM"
+
+#: src/modules/displaymanager/main.py:577
+msgid "LXDM config file {!s} does not exist"
+msgstr "Tập tin cấu hình LXDM {!s} không tồn tại"
+
+#: src/modules/displaymanager/main.py:660
+msgid "Cannot write LightDM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình LightDM"
+
+#: src/modules/displaymanager/main.py:661
+msgid "LightDM config file {!s} does not exist"
+msgstr "Tập tin cấu hình LightDM {!s} không tồn tại"
+
+#: src/modules/displaymanager/main.py:735
+msgid "Cannot configure LightDM"
+msgstr "Không thể cấu hình LXDM"
+
+#: src/modules/displaymanager/main.py:736
+msgid "No LightDM greeter installed."
+msgstr "Màn hình chào mừng LightDM không được cài đặt."
+
+#: src/modules/displaymanager/main.py:767
+msgid "Cannot write SLIM configuration file"
+msgstr "Không thể ghi vào tập tin cấu hình SLIM"
+
+#: src/modules/displaymanager/main.py:768
+msgid "SLIM config file {!s} does not exist"
+msgstr "Tập tin cấu hình SLIM {!s} không tồn tại"
+
+#: src/modules/displaymanager/main.py:894
+msgid "No display managers selected for the displaymanager module."
+msgstr ""
+"Không có trình quản lý hiển thị nào được chọn cho mô-đun quản lý hiển thị"
+
+#: src/modules/displaymanager/main.py:895
+msgid ""
+"The displaymanagers list is empty or undefined in both globalstorage and "
+"displaymanager.conf."
+msgstr ""
+"Danh sách quản lý hiện thị trống hoặc không được định nghĩa cả trong "
+"globalstorage và displaymanager.conf."
+
+#: src/modules/displaymanager/main.py:977
+msgid "Display manager configuration was incomplete"
+msgstr "Cầu hình quản lý hiện thị không hoàn tất"
+
+#: src/modules/initcpiocfg/main.py:28
+msgid "Configuring mkinitcpio."
+msgstr "Đang cấu hình mkinitcpio."
+
+#: src/modules/initcpiocfg/main.py:201
+#: src/modules/luksopenswaphookcfg/main.py:91
+#: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:74
+#: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136
+#: src/modules/networkcfg/main.py:40
+msgid "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr "Không có điểm kết nối gốc cho <pre>{!s}</pre> để dùng."
+
+#: src/modules/luksopenswaphookcfg/main.py:26
+msgid "Configuring encrypted swap."
+msgstr "Đang cấu hình hoán đổi mã hoá"
+
+#: src/modules/rawfs/main.py:26
+msgid "Installing data."
+msgstr "Đang cài đặt dữ liệu."
+
+#: src/modules/services-openrc/main.py:29
+msgid "Configure OpenRC services"
+msgstr "Cấu hình dịch vụ OpenRC"
+
+#: src/modules/services-openrc/main.py:57
+msgid "Cannot add service {name!s} to run-level {level!s}."
+msgstr "Không thể thêm dịch vụ {name!s} vào run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:59
+msgid "Cannot remove service {name!s} from run-level {level!s}."
+msgstr "Không thể loại bỏ dịch vụ {name!s} từ run-level {level!s}."
+
+#: src/modules/services-openrc/main.py:61
+msgid ""
+"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
+"level {level!s}."
+msgstr ""
+"Không nhận ra thao tác <code>{arg!s}</code> cho dịch vụ {name!s} ở run-level"
+" {level!s}."
+
+#: src/modules/services-openrc/main.py:94
+msgid ""
+"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
+msgstr ""
+"Lệnh <code>rc-update {arg!s}</code> trong môi trường chroot trả về lỗi "
+"{num!s}."
+
+#: src/modules/services-openrc/main.py:101
+msgid "Target runlevel does not exist"
+msgstr "Nhóm dịch vụ khởi động không tồn tại"
+
+#: src/modules/services-openrc/main.py:102
+msgid ""
+"The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
+"exist."
+msgstr ""
+"Đường dẫn cho runlevel {level!s} là <code>{path!s}</code>, nhưng không tồn "
+"tại."
+
+#: src/modules/services-openrc/main.py:110
+msgid "Target service does not exist"
+msgstr "Nhóm dịch vụ không tồn tại"
+
+#: src/modules/services-openrc/main.py:111
+msgid ""
+"The path for service {name!s} is <code>{path!s}</code>, which does not "
+"exist."
+msgstr ""
+"Đường dẫn cho dịch vụ {name!s} là <code>{path!s}</code>, nhưng không tồn "
+"tại."
+
+#: src/modules/plymouthcfg/main.py:27
+msgid "Configure Plymouth theme"
+msgstr "Cấu hình giao diện Plymouth"
+
+#: src/modules/packages/main.py:50 src/modules/packages/main.py:59
+#: src/modules/packages/main.py:69
+msgid "Install packages."
+msgstr "Đang cài đặt các gói ứng dụng."
+
+#: src/modules/packages/main.py:57
+#, python-format
+msgid "Processing packages (%(count)d / %(total)d)"
+msgstr "Đang xử lý gói (%(count)d / %(total)d)"
+
+#: src/modules/packages/main.py:62
+#, python-format
+msgid "Installing one package."
+msgid_plural "Installing %(num)d packages."
+msgstr[0] "Đang cài đặt %(num)d gói ứng dụng."
+
+#: src/modules/packages/main.py:65
+#, python-format
+msgid "Removing one package."
+msgid_plural "Removing %(num)d packages."
+msgstr[0] "Đang gỡ bỏ %(num)d gói ứng dụng."
+
+#: src/modules/bootloader/main.py:42
+msgid "Install bootloader."
+msgstr "Đang cài đặt bộ khởi động."
+
+#: src/modules/hwclock/main.py:26
+msgid "Setting hardware clock."
+msgstr "Đang thiết lập đồng hồ máy tính."
+
+#: src/modules/mkinitfs/main.py:27
+msgid "Creating initramfs with mkinitfs."
+msgstr "Đang tạo initramfs bằng mkinitfs."
+
+#: src/modules/mkinitfs/main.py:49
+msgid "Failed to run mkinitfs on the target"
+msgstr "Chạy mkinitfs thất bại ở hệ thống đích"
+
+#: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
+msgid "The exit code was {}"
+msgstr "Mã lỗi trả về là {}"
+
+#: src/modules/dracut/main.py:27
+msgid "Creating initramfs with dracut."
+msgstr "Đang tạo initramfs bằng dracut."
+
+#: src/modules/dracut/main.py:49
+msgid "Failed to run dracut on the target"
+msgstr "Chạy dracut thất bại ở hệ thống đích"
+
+#: src/modules/initramfscfg/main.py:32
+msgid "Configuring initramfs."
+msgstr "Đang cấu hình initramfs."
+
+#: src/modules/openrcdmcryptcfg/main.py:25
+msgid "Configuring OpenRC dmcrypt service."
+msgstr "Đang cấu hình dịch vụ OpenRC dmcrypt."
+
+#: src/modules/fstab/main.py:29
+msgid "Writing fstab."
+msgstr "Đang viết vào fstab."
+
+#: src/modules/dummypython/main.py:35
+msgid "Dummy python job."
+msgstr "Ví dụ công việc python."
+
+#: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
+#: src/modules/dummypython/main.py:94
+msgid "Dummy python step {}"
+msgstr "Ví dụ python bước {}"
+
+#: src/modules/localecfg/main.py:30
+msgid "Configuring locales."
+msgstr "Đang cấu hình ngôn ngữ."
+
+#: src/modules/networkcfg/main.py:28
+msgid "Saving network configuration."
+msgstr "Đang lưu cấu hình mạng."
diff --git a/lang/python/zh_TW/LC_MESSAGES/python.po b/lang/python/zh_TW/LC_MESSAGES/python.po
index 92457638c..4196c3d0b 100644
--- a/lang/python/zh_TW/LC_MESSAGES/python.po
+++ b/lang/python/zh_TW/LC_MESSAGES/python.po
@@ -199,7 +199,7 @@ msgstr "未在顯示管理器模組中選取顯示管理器。"
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
-msgstr ""
+msgstr "顯示管理器清單為空或在 globalstorage 與 displaymanager.conf 中皆未定義。"
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"

From c36aa43f86118f2fd8c7c1304c27a3c7b6ce5605 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 29 Oct 2020 15:57:53 +0100
Subject: [PATCH 107/228] CI: use a larger tmpfs for the build (my local build/
 is 112M)

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1df81a6bf..7a1ba094d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,5 +19,5 @@ install:
   - docker build -t calamares .
 
 script:
-  - docker run -v $PWD:/src --tmpfs /build:rw,size=81920k -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh"
+  - docker run -v $PWD:/src --tmpfs /build:rw,size=112M -e SRCDIR=/src -e BUILDDIR=/build calamares "/src/ci/travis.sh"
 

From 8457a00ad0347a0f745cd2b426107b1af1bcd03f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 11:05:15 +0100
Subject: [PATCH 108/228] [keyboard] Fix group-switcher multiplying

FIXES #1556
---
 src/modules/keyboard/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 6475d9bc8..5d5e80d5f 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -108,7 +108,7 @@ xkbmap_query_grp_option()
     //it's either in the end of line or before the other option so \s or ,
     int lastIndex = outputLine.indexOf( QRegExp( "[\\s,]" ), index );
 
-    return outputLine.mid( index, lastIndex - 1 );
+    return outputLine.mid( index, lastIndex - index );
 }
 
 AdditionalLayoutInfo

From 7ec8c454bd61d4749abb64d0cccb061a3c4b01e7 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 11:21:57 +0100
Subject: [PATCH 109/228] [keyboard] Ukranian needs a switcher, too

---
 CHANGES                                | 2 +-
 src/modules/keyboard/non-ascii-layouts | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 73c99cf9b..37dd0612f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -25,7 +25,7 @@ This release contains contributions from (alphabetically by first name):
 ## Modules ##
  - The *keyboard* and *keyboardq* modules now share backend code
    and handle non-ASCII layouts better (for setting passwords
-   and usernames).
+   and usernames). (thanks Artem)
 
 
 # 3.2.32.1 (2020-10-17) #
diff --git a/src/modules/keyboard/non-ascii-layouts b/src/modules/keyboard/non-ascii-layouts
index 83935c190..9bdfa34be 100644
--- a/src/modules/keyboard/non-ascii-layouts
+++ b/src/modules/keyboard/non-ascii-layouts
@@ -2,3 +2,4 @@
 
 #layout   additional-layout   additional-variant   vconsole-keymap
 ru        us                  -                    ruwin_alt_sh-UTF-8
+ua        us                  -                    ua-utf

From 5a378090c20aac3140f1e23ed81241ca7a8ebe9d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 12:16:14 +0100
Subject: [PATCH 110/228] [keyboard] Do not munge keyboard model name

The translation happens whenever this code is run, which may
not match the language the user subsequently selects.
It also causes general problems with the translation,
since we end up with a possibly-partly-translated name.
---
 src/modules/keyboard/keyboardwidget/keyboardglobal.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/modules/keyboard/keyboardwidget/keyboardglobal.cpp b/src/modules/keyboard/keyboardwidget/keyboardglobal.cpp
index 8099cb231..d01c8b591 100644
--- a/src/modules/keyboard/keyboardwidget/keyboardglobal.cpp
+++ b/src/modules/keyboard/keyboardwidget/keyboardglobal.cpp
@@ -84,12 +84,6 @@ parseKeyboardModels( const char* filepath )
         {
             QString modelDesc = rx.cap( 2 );
             QString model = rx.cap( 1 );
-
-            if ( model == "pc105" )
-            {
-                modelDesc += "  -  " + QObject::tr( "Default Keyboard Model" );
-            }
-
             models.insert( modelDesc, model );
         }
     }

From 2e9a44269c89b3d8c10d8481b0c9d4f7f10c4852 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 12:35:21 +0100
Subject: [PATCH 111/228] [keyboard] Extracted strings from keyboard list

---
 src/modules/keyboard/KeyboardData_p.cxxtr | 812 ++++++++++++++++++++++
 src/modules/keyboard/layout-extractor.py  |  94 +++
 2 files changed, 906 insertions(+)
 create mode 100644 src/modules/keyboard/KeyboardData_p.cxxtr
 create mode 100644 src/modules/keyboard/layout-extractor.py

diff --git a/src/modules/keyboard/KeyboardData_p.cxxtr b/src/modules/keyboard/KeyboardData_p.cxxtr
new file mode 100644
index 000000000..678bb9807
--- /dev/null
+++ b/src/modules/keyboard/KeyboardData_p.cxxtr
@@ -0,0 +1,812 @@
+/*   GENERATED FILE DO NOT EDIT
+*
+*  === This file is part of Calamares - <https://calamares.io> ===
+*
+* SPDX-FileCopyrightText: no
+* SPDX-License-Identifier: CC0-1.0
+*
+* This file is derived from base.lst in the Xorg distribution
+*
+*/
+
+/** THIS FILE EXISTS ONLY FOR TRANSLATIONS PURPOSES **/
+
+// *INDENT-OFF*
+// clang-format off
+/* This returns a reference to local, which is a terrible idea.
+ * Good thing it's not meant to be compiled.
+ */
+static const QStringList& kb_models_table()
+{
+	return QStringList {
+		QObject::tr("A4Tech KB-21", "kb_models"),
+		QObject::tr("A4Tech KBS-8", "kb_models"),
+		QObject::tr("A4Tech Wireless Desktop RFKB-23", "kb_models"),
+		QObject::tr("Acer AirKey V", "kb_models"),
+		QObject::tr("Acer C300", "kb_models"),
+		QObject::tr("Acer Ferrari 4000", "kb_models"),
+		QObject::tr("Acer laptop", "kb_models"),
+		QObject::tr("Advance Scorpius KI", "kb_models"),
+		QObject::tr("Apple", "kb_models"),
+		QObject::tr("Apple Aluminium (ANSI)", "kb_models"),
+		QObject::tr("Apple Aluminium (ISO)", "kb_models"),
+		QObject::tr("Apple Aluminium (JIS)", "kb_models"),
+		QObject::tr("Apple laptop", "kb_models"),
+		QObject::tr("Asus laptop", "kb_models"),
+		QObject::tr("Azona RF2300 wireless Internet", "kb_models"),
+		QObject::tr("BTC 5090", "kb_models"),
+		QObject::tr("BTC 5113RF Multimedia", "kb_models"),
+		QObject::tr("BTC 5126T", "kb_models"),
+		QObject::tr("BTC 6301URF", "kb_models"),
+		QObject::tr("BTC 9000", "kb_models"),
+		QObject::tr("BTC 9000A", "kb_models"),
+		QObject::tr("BTC 9001AH", "kb_models"),
+		QObject::tr("BTC 9019U", "kb_models"),
+		QObject::tr("BTC 9116U Mini Wireless Internet and Gaming", "kb_models"),
+		QObject::tr("BenQ X-Touch", "kb_models"),
+		QObject::tr("BenQ X-Touch 730", "kb_models"),
+		QObject::tr("BenQ X-Touch 800", "kb_models"),
+		QObject::tr("Brother Internet", "kb_models"),
+		QObject::tr("Cherry B.UNLIMITED", "kb_models"),
+		QObject::tr("Cherry Blue Line CyBo@rd", "kb_models"),
+		QObject::tr("Cherry Blue Line CyBo@rd (alt.)", "kb_models"),
+		QObject::tr("Cherry CyBo@rd USB-Hub", "kb_models"),
+		QObject::tr("Cherry CyMotion Expert", "kb_models"),
+		QObject::tr("Cherry CyMotion Master Linux", "kb_models"),
+		QObject::tr("Cherry CyMotion Master XPress", "kb_models"),
+		QObject::tr("Chicony Internet", "kb_models"),
+		QObject::tr("Chicony KB-9885", "kb_models"),
+		QObject::tr("Chicony KU-0108", "kb_models"),
+		QObject::tr("Chicony KU-0420", "kb_models"),
+		QObject::tr("Chromebook", "kb_models"),
+		QObject::tr("Classmate PC", "kb_models"),
+		QObject::tr("Compaq Armada laptop", "kb_models"),
+		QObject::tr("Compaq Easy Access", "kb_models"),
+		QObject::tr("Compaq Internet (13 keys)", "kb_models"),
+		QObject::tr("Compaq Internet (18 keys)", "kb_models"),
+		QObject::tr("Compaq Internet (7 keys)", "kb_models"),
+		QObject::tr("Compaq Presario laptop", "kb_models"),
+		QObject::tr("Compaq iPaq", "kb_models"),
+		QObject::tr("Creative Desktop Wireless 7000", "kb_models"),
+		QObject::tr("DTK2000", "kb_models"),
+		QObject::tr("Dell", "kb_models"),
+		QObject::tr("Dell 101-key PC", "kb_models"),
+		QObject::tr("Dell Inspiron 6000/8000 laptop", "kb_models"),
+		QObject::tr("Dell Latitude laptop", "kb_models"),
+		QObject::tr("Dell Precision M laptop", "kb_models"),
+		QObject::tr("Dell Precision M65 laptop", "kb_models"),
+		QObject::tr("Dell SK-8125", "kb_models"),
+		QObject::tr("Dell SK-8135", "kb_models"),
+		QObject::tr("Dell USB Multimedia", "kb_models"),
+		QObject::tr("Dexxa Wireless Desktop", "kb_models"),
+		QObject::tr("Diamond 9801/9802", "kb_models"),
+		QObject::tr("Ennyah DKB-1008", "kb_models"),
+		QObject::tr("Everex STEPnote", "kb_models"),
+		QObject::tr("FL90", "kb_models"),
+		QObject::tr("Fujitsu-Siemens Amilo laptop", "kb_models"),
+		QObject::tr("Generic 101-key PC", "kb_models"),
+		QObject::tr("Generic 102-key PC", "kb_models"),
+		QObject::tr("Generic 104-key PC", "kb_models"),
+		QObject::tr("Generic 104-key PC with L-shaped Enter key", "kb_models"),
+		QObject::tr("Generic 105-key PC", "kb_models"),
+		QObject::tr("Generic 86-key PC", "kb_models"),
+		QObject::tr("Genius Comfy KB-12e", "kb_models"),
+		QObject::tr("Genius Comfy KB-16M/Multimedia KWD-910", "kb_models"),
+		QObject::tr("Genius Comfy KB-21e-Scroll", "kb_models"),
+		QObject::tr("Genius KB-19e NB", "kb_models"),
+		QObject::tr("Genius KKB-2050HS", "kb_models"),
+		QObject::tr("Gyration", "kb_models"),
+		QObject::tr("Happy Hacking", "kb_models"),
+		QObject::tr("Happy Hacking for Mac", "kb_models"),
+		QObject::tr("Hewlett-Packard Internet", "kb_models"),
+		QObject::tr("Hewlett-Packard Mini 110 laptop", "kb_models"),
+		QObject::tr("Hewlett-Packard NEC SK-2500 Multimedia", "kb_models"),
+		QObject::tr("Hewlett-Packard Omnibook 500", "kb_models"),
+		QObject::tr("Hewlett-Packard Omnibook 500 FA", "kb_models"),
+		QObject::tr("Hewlett-Packard Omnibook 6000/6100", "kb_models"),
+		QObject::tr("Hewlett-Packard Omnibook XE3 GC", "kb_models"),
+		QObject::tr("Hewlett-Packard Omnibook XE3 GF", "kb_models"),
+		QObject::tr("Hewlett-Packard Omnibook XT1000", "kb_models"),
+		QObject::tr("Hewlett-Packard Pavilion ZT1100", "kb_models"),
+		QObject::tr("Hewlett-Packard Pavilion dv5", "kb_models"),
+		QObject::tr("Hewlett-Packard nx9020", "kb_models"),
+		QObject::tr("Honeywell Euroboard", "kb_models"),
+		QObject::tr("IBM Rapid Access", "kb_models"),
+		QObject::tr("IBM Rapid Access II", "kb_models"),
+		QObject::tr("IBM Space Saver", "kb_models"),
+		QObject::tr("IBM ThinkPad 560Z/600/600E/A22E", "kb_models"),
+		QObject::tr("IBM ThinkPad R60/T60/R61/T61", "kb_models"),
+		QObject::tr("IBM ThinkPad Z60m/Z60t/Z61m/Z61t", "kb_models"),
+		QObject::tr("Keytronic FlexPro", "kb_models"),
+		QObject::tr("Kinesis", "kb_models"),
+		QObject::tr("Logitech", "kb_models"),
+		QObject::tr("Logitech Access", "kb_models"),
+		QObject::tr("Logitech Cordless Desktop", "kb_models"),
+		QObject::tr("Logitech Cordless Desktop (alt.)", "kb_models"),
+		QObject::tr("Logitech Cordless Desktop EX110", "kb_models"),
+		QObject::tr("Logitech Cordless Desktop LX-300", "kb_models"),
+		QObject::tr("Logitech Cordless Desktop Navigator", "kb_models"),
+		QObject::tr("Logitech Cordless Desktop Optical", "kb_models"),
+		QObject::tr("Logitech Cordless Desktop Pro (2nd alt.)", "kb_models"),
+		QObject::tr("Logitech Cordless Desktop iTouch", "kb_models"),
+		QObject::tr("Logitech Cordless Freedom/Desktop Navigator", "kb_models"),
+		QObject::tr("Logitech G15 extra keys via G15daemon", "kb_models"),
+		QObject::tr("Logitech Internet", "kb_models"),
+		QObject::tr("Logitech Internet 350", "kb_models"),
+		QObject::tr("Logitech Internet Navigator", "kb_models"),
+		QObject::tr("Logitech Ultra-X", "kb_models"),
+		QObject::tr("Logitech Ultra-X Cordless Media Desktop", "kb_models"),
+		QObject::tr("Logitech diNovo", "kb_models"),
+		QObject::tr("Logitech diNovo Edge", "kb_models"),
+		QObject::tr("Logitech iTouch", "kb_models"),
+		QObject::tr("Logitech iTouch Cordless Y-RB6", "kb_models"),
+		QObject::tr("Logitech iTouch Internet Navigator SE", "kb_models"),
+		QObject::tr("Logitech iTouch Internet Navigator SE USB", "kb_models"),
+		QObject::tr("MacBook/MacBook Pro", "kb_models"),
+		QObject::tr("MacBook/MacBook Pro (intl.)", "kb_models"),
+		QObject::tr("Macintosh", "kb_models"),
+		QObject::tr("Macintosh Old", "kb_models"),
+		QObject::tr("Memorex MX1998", "kb_models"),
+		QObject::tr("Memorex MX2500 EZ-Access", "kb_models"),
+		QObject::tr("Memorex MX2750", "kb_models"),
+		QObject::tr("Microsoft Comfort Curve 2000", "kb_models"),
+		QObject::tr("Microsoft Internet", "kb_models"),
+		QObject::tr("Microsoft Internet Pro (Swedish)", "kb_models"),
+		QObject::tr("Microsoft Natural", "kb_models"),
+		QObject::tr("Microsoft Natural Elite", "kb_models"),
+		QObject::tr("Microsoft Natural Ergonomic 4000", "kb_models"),
+		QObject::tr("Microsoft Natural Pro OEM", "kb_models"),
+		QObject::tr("Microsoft Natural Pro USB/Internet Pro", "kb_models"),
+		QObject::tr("Microsoft Natural Pro/Internet Pro", "kb_models"),
+		QObject::tr("Microsoft Natural Wireless Ergonomic 7000", "kb_models"),
+		QObject::tr("Microsoft Office Keyboard", "kb_models"),
+		QObject::tr("Microsoft Surface", "kb_models"),
+		QObject::tr("Microsoft Wireless Multimedia 1.0A", "kb_models"),
+		QObject::tr("NEC SK-1300", "kb_models"),
+		QObject::tr("NEC SK-2500", "kb_models"),
+		QObject::tr("NEC SK-6200", "kb_models"),
+		QObject::tr("NEC SK-7100", "kb_models"),
+		QObject::tr("Northgate OmniKey 101", "kb_models"),
+		QObject::tr("OLPC", "kb_models"),
+		QObject::tr("Ortek Multimedia/Internet MCK-800", "kb_models"),
+		QObject::tr("PC-98", "kb_models"),
+		QObject::tr("Propeller Voyager KTEZ-1000", "kb_models"),
+		QObject::tr("QTronix Scorpius 98N+", "kb_models"),
+		QObject::tr("SVEN Ergonomic 2500", "kb_models"),
+		QObject::tr("SVEN Slim 303", "kb_models"),
+		QObject::tr("Samsung SDM 4500P", "kb_models"),
+		QObject::tr("Samsung SDM 4510P", "kb_models"),
+		QObject::tr("Sanwa Supply SKB-KG3", "kb_models"),
+		QObject::tr("Silvercrest Multimedia Wireless", "kb_models"),
+		QObject::tr("SteelSeries Apex 300 (Apex RAW)", "kb_models"),
+		QObject::tr("Sun Type 6 (Japanese)", "kb_models"),
+		QObject::tr("Sun Type 6 USB (Japanese)", "kb_models"),
+		QObject::tr("Sun Type 6 USB (Unix)", "kb_models"),
+		QObject::tr("Sun Type 6/7 USB", "kb_models"),
+		QObject::tr("Sun Type 6/7 USB (European)", "kb_models"),
+		QObject::tr("Sun Type 7 USB", "kb_models"),
+		QObject::tr("Sun Type 7 USB (European)", "kb_models"),
+		QObject::tr("Sun Type 7 USB (Japanese)/Japanese 106-key", "kb_models"),
+		QObject::tr("Sun Type 7 USB (Unix)", "kb_models"),
+		QObject::tr("Super Power Multimedia", "kb_models"),
+		QObject::tr("Symplon PaceBook tablet", "kb_models"),
+		QObject::tr("Targa Visionary 811", "kb_models"),
+		QObject::tr("Toshiba Satellite S3000", "kb_models"),
+		QObject::tr("Truly Ergonomic 227", "kb_models"),
+		QObject::tr("Truly Ergonomic 229", "kb_models"),
+		QObject::tr("Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)", "kb_models"),
+		QObject::tr("Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)", "kb_models"),
+		QObject::tr("Trust Direct Access", "kb_models"),
+		QObject::tr("Trust Slimline", "kb_models"),
+		QObject::tr("Trust Wireless Classic", "kb_models"),
+		QObject::tr("TypeMatrix EZ-Reach 2020", "kb_models"),
+		QObject::tr("TypeMatrix EZ-Reach 2030 PS2", "kb_models"),
+		QObject::tr("TypeMatrix EZ-Reach 2030 USB", "kb_models"),
+		QObject::tr("TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)", "kb_models"),
+		QObject::tr("TypeMatrix EZ-Reach 2030 USB (106:JP mode)", "kb_models"),
+		QObject::tr("Unitek KB-1925", "kb_models"),
+		QObject::tr("ViewSonic KU-306 Internet", "kb_models"),
+		QObject::tr("Winbook Model XP5", "kb_models"),
+		QObject::tr("Yahoo! Internet", "kb_models"),
+		QObject::tr("eMachines m6800 laptop", "kb_models"),
+		QString()
+	};
+}
+
+/* This returns a reference to local, which is a terrible idea.
+ * Good thing it's not meant to be compiled.
+ */
+static const QStringList& kb_layouts_table()
+{
+	return QStringList {
+		QObject::tr("Afghani", "kb_layouts"),
+		QObject::tr("Albanian", "kb_layouts"),
+		QObject::tr("Amharic", "kb_layouts"),
+		QObject::tr("Arabic", "kb_layouts"),
+		QObject::tr("Arabic (Morocco)", "kb_layouts"),
+		QObject::tr("Arabic (Syria)", "kb_layouts"),
+		QObject::tr("Armenian", "kb_layouts"),
+		QObject::tr("Azerbaijani", "kb_layouts"),
+		QObject::tr("Bambara", "kb_layouts"),
+		QObject::tr("Bangla", "kb_layouts"),
+		QObject::tr("Belarusian", "kb_layouts"),
+		QObject::tr("Belgian", "kb_layouts"),
+		QObject::tr("Bosnian", "kb_layouts"),
+		QObject::tr("Braille", "kb_layouts"),
+		QObject::tr("Bulgarian", "kb_layouts"),
+		QObject::tr("Burmese", "kb_layouts"),
+		QObject::tr("Chinese", "kb_layouts"),
+		QObject::tr("Croatian", "kb_layouts"),
+		QObject::tr("Czech", "kb_layouts"),
+		QObject::tr("Danish", "kb_layouts"),
+		QObject::tr("Dhivehi", "kb_layouts"),
+		QObject::tr("Dutch", "kb_layouts"),
+		QObject::tr("Dzongkha", "kb_layouts"),
+		QObject::tr("English (Australian)", "kb_layouts"),
+		QObject::tr("English (Cameroon)", "kb_layouts"),
+		QObject::tr("English (Ghana)", "kb_layouts"),
+		QObject::tr("English (Nigeria)", "kb_layouts"),
+		QObject::tr("English (South Africa)", "kb_layouts"),
+		QObject::tr("English (UK)", "kb_layouts"),
+		QObject::tr("English (US)", "kb_layouts"),
+		QObject::tr("Esperanto", "kb_layouts"),
+		QObject::tr("Estonian", "kb_layouts"),
+		QObject::tr("Faroese", "kb_layouts"),
+		QObject::tr("Filipino", "kb_layouts"),
+		QObject::tr("Finnish", "kb_layouts"),
+		QObject::tr("French", "kb_layouts"),
+		QObject::tr("French (Canada)", "kb_layouts"),
+		QObject::tr("French (Democratic Republic of the Congo)", "kb_layouts"),
+		QObject::tr("French (Guinea)", "kb_layouts"),
+		QObject::tr("French (Togo)", "kb_layouts"),
+		QObject::tr("Georgian", "kb_layouts"),
+		QObject::tr("German", "kb_layouts"),
+		QObject::tr("German (Austria)", "kb_layouts"),
+		QObject::tr("German (Switzerland)", "kb_layouts"),
+		QObject::tr("Greek", "kb_layouts"),
+		QObject::tr("Hebrew", "kb_layouts"),
+		QObject::tr("Hungarian", "kb_layouts"),
+		QObject::tr("Icelandic", "kb_layouts"),
+		QObject::tr("Indian", "kb_layouts"),
+		QObject::tr("Indonesian (Arab Melayu, phonetic)", "kb_layouts"),
+		QObject::tr("Indonesian (Javanese)", "kb_layouts"),
+		QObject::tr("Iraqi", "kb_layouts"),
+		QObject::tr("Irish", "kb_layouts"),
+		QObject::tr("Italian", "kb_layouts"),
+		QObject::tr("Japanese", "kb_layouts"),
+		QObject::tr("Japanese (PC-98)", "kb_layouts"),
+		QObject::tr("Kabylian (azerty layout, no dead keys)", "kb_layouts"),
+		QObject::tr("Kazakh", "kb_layouts"),
+		QObject::tr("Khmer (Cambodia)", "kb_layouts"),
+		QObject::tr("Korean", "kb_layouts"),
+		QObject::tr("Kyrgyz", "kb_layouts"),
+		QObject::tr("Lao", "kb_layouts"),
+		QObject::tr("Latvian", "kb_layouts"),
+		QObject::tr("Lithuanian", "kb_layouts"),
+		QObject::tr("Macedonian", "kb_layouts"),
+		QObject::tr("Malay (Jawi, Arabic Keyboard)", "kb_layouts"),
+		QObject::tr("Maltese", "kb_layouts"),
+		QObject::tr("Maori", "kb_layouts"),
+		QObject::tr("Moldavian", "kb_layouts"),
+		QObject::tr("Mongolian", "kb_layouts"),
+		QObject::tr("Montenegrin", "kb_layouts"),
+		QObject::tr("Nepali", "kb_layouts"),
+		QObject::tr("Norwegian", "kb_layouts"),
+		QObject::tr("Persian", "kb_layouts"),
+		QObject::tr("Polish", "kb_layouts"),
+		QObject::tr("Portuguese", "kb_layouts"),
+		QObject::tr("Portuguese (Brazil)", "kb_layouts"),
+		QObject::tr("Romanian", "kb_layouts"),
+		QObject::tr("Russian", "kb_layouts"),
+		QObject::tr("Serbian", "kb_layouts"),
+		QObject::tr("Sinhala (phonetic)", "kb_layouts"),
+		QObject::tr("Slovak", "kb_layouts"),
+		QObject::tr("Slovenian", "kb_layouts"),
+		QObject::tr("Spanish", "kb_layouts"),
+		QObject::tr("Spanish (Latin American)", "kb_layouts"),
+		QObject::tr("Swahili (Kenya)", "kb_layouts"),
+		QObject::tr("Swahili (Tanzania)", "kb_layouts"),
+		QObject::tr("Swedish", "kb_layouts"),
+		QObject::tr("Taiwanese", "kb_layouts"),
+		QObject::tr("Tajik", "kb_layouts"),
+		QObject::tr("Thai", "kb_layouts"),
+		QObject::tr("Tswana", "kb_layouts"),
+		QObject::tr("Turkish", "kb_layouts"),
+		QObject::tr("Turkmen", "kb_layouts"),
+		QObject::tr("Ukrainian", "kb_layouts"),
+		QObject::tr("Urdu (Pakistan)", "kb_layouts"),
+		QObject::tr("Uzbek", "kb_layouts"),
+		QObject::tr("Vietnamese", "kb_layouts"),
+		QObject::tr("Wolof", "kb_layouts"),
+		QString()
+	};
+}
+
+/* This returns a reference to local, which is a terrible idea.
+ * Good thing it's not meant to be compiled.
+ */
+static const QStringList& kb_variants_table()
+{
+	return QStringList {
+		QObject::tr("Akan", "kb_variants"),
+		QObject::tr("Albanian (Plisi)", "kb_variants"),
+		QObject::tr("Albanian (Veqilharxhi)", "kb_variants"),
+		QObject::tr("Arabic (AZERTY)", "kb_variants"),
+		QObject::tr("Arabic (AZERTY, Eastern Arabic numerals)", "kb_variants"),
+		QObject::tr("Arabic (Algeria)", "kb_variants"),
+		QObject::tr("Arabic (Buckwalter)", "kb_variants"),
+		QObject::tr("Arabic (Eastern Arabic numerals)", "kb_variants"),
+		QObject::tr("Arabic (Macintosh)", "kb_variants"),
+		QObject::tr("Arabic (OLPC)", "kb_variants"),
+		QObject::tr("Arabic (Pakistan)", "kb_variants"),
+		QObject::tr("Arabic (QWERTY)", "kb_variants"),
+		QObject::tr("Arabic (QWERTY, Eastern Arabic numerals)", "kb_variants"),
+		QObject::tr("Armenian (alt. eastern)", "kb_variants"),
+		QObject::tr("Armenian (alt. phonetic)", "kb_variants"),
+		QObject::tr("Armenian (eastern)", "kb_variants"),
+		QObject::tr("Armenian (phonetic)", "kb_variants"),
+		QObject::tr("Armenian (western)", "kb_variants"),
+		QObject::tr("Asturian (Spain, with bottom-dot H and L)", "kb_variants"),
+		QObject::tr("Avatime", "kb_variants"),
+		QObject::tr("Azerbaijani (Cyrillic)", "kb_variants"),
+		QObject::tr("Bangla (India)", "kb_variants"),
+		QObject::tr("Bangla (India, Baishakhi Inscript)", "kb_variants"),
+		QObject::tr("Bangla (India, Baishakhi)", "kb_variants"),
+		QObject::tr("Bangla (India, Bornona)", "kb_variants"),
+		QObject::tr("Bangla (India, Gitanjali)", "kb_variants"),
+		QObject::tr("Bangla (India, Probhat)", "kb_variants"),
+		QObject::tr("Bangla (Probhat)", "kb_variants"),
+		QObject::tr("Bashkirian", "kb_variants"),
+		QObject::tr("Belarusian (Latin)", "kb_variants"),
+		QObject::tr("Belarusian (intl.)", "kb_variants"),
+		QObject::tr("Belarusian (legacy)", "kb_variants"),
+		QObject::tr("Belgian (ISO, alt.)", "kb_variants"),
+		QObject::tr("Belgian (Latin-9 only, alt.)", "kb_variants"),
+		QObject::tr("Belgian (Sun dead keys)", "kb_variants"),
+		QObject::tr("Belgian (Sun dead keys, alt.)", "kb_variants"),
+		QObject::tr("Belgian (Wang 724 AZERTY)", "kb_variants"),
+		QObject::tr("Belgian (alt.)", "kb_variants"),
+		QObject::tr("Belgian (no dead keys)", "kb_variants"),
+		QObject::tr("Berber (Morocco, Tifinagh alt.)", "kb_variants"),
+		QObject::tr("Berber (Morocco, Tifinagh extended phonetic)", "kb_variants"),
+		QObject::tr("Berber (Morocco, Tifinagh extended)", "kb_variants"),
+		QObject::tr("Berber (Morocco, Tifinagh phonetic)", "kb_variants"),
+		QObject::tr("Berber (Morocco, Tifinagh phonetic, alt.)", "kb_variants"),
+		QObject::tr("Berber (Morocco, Tifinagh)", "kb_variants"),
+		QObject::tr("Bosnian (US)", "kb_variants"),
+		QObject::tr("Bosnian (US, with Bosnian digraphs)", "kb_variants"),
+		QObject::tr("Bosnian (with Bosnian digraphs)", "kb_variants"),
+		QObject::tr("Bosnian (with guillemets)", "kb_variants"),
+		QObject::tr("Braille (left-handed inverted thumb)", "kb_variants"),
+		QObject::tr("Braille (left-handed)", "kb_variants"),
+		QObject::tr("Braille (right-handed inverted thumb)", "kb_variants"),
+		QObject::tr("Braille (right-handed)", "kb_variants"),
+		QObject::tr("Bulgarian (enhanced)", "kb_variants"),
+		QObject::tr("Bulgarian (new phonetic)", "kb_variants"),
+		QObject::tr("Bulgarian (traditional phonetic)", "kb_variants"),
+		QObject::tr("Burmese Zawgyi", "kb_variants"),
+		QObject::tr("Cameroon (AZERTY, intl.)", "kb_variants"),
+		QObject::tr("Cameroon (Dvorak, intl.)", "kb_variants"),
+		QObject::tr("Cameroon Multilingual (QWERTY, intl.)", "kb_variants"),
+		QObject::tr("Canadian (intl.)", "kb_variants"),
+		QObject::tr("Canadian (intl., 1st part)", "kb_variants"),
+		QObject::tr("Canadian (intl., 2nd part)", "kb_variants"),
+		QObject::tr("Catalan (Spain, with middle-dot L)", "kb_variants"),
+		QObject::tr("Cherokee", "kb_variants"),
+		QObject::tr("Chuvash", "kb_variants"),
+		QObject::tr("Chuvash (Latin)", "kb_variants"),
+		QObject::tr("CloGaelach", "kb_variants"),
+		QObject::tr("Crimean Tatar (Turkish Alt-Q)", "kb_variants"),
+		QObject::tr("Crimean Tatar (Turkish F)", "kb_variants"),
+		QObject::tr("Crimean Tatar (Turkish Q)", "kb_variants"),
+		QObject::tr("Croatian (US)", "kb_variants"),
+		QObject::tr("Croatian (US, with Croatian digraphs)", "kb_variants"),
+		QObject::tr("Croatian (with Croatian digraphs)", "kb_variants"),
+		QObject::tr("Croatian (with guillemets)", "kb_variants"),
+		QObject::tr("Czech (QWERTY)", "kb_variants"),
+		QObject::tr("Czech (QWERTY, Macintosh)", "kb_variants"),
+		QObject::tr("Czech (QWERTY, extended backslash)", "kb_variants"),
+		QObject::tr("Czech (UCW, only accented letters)", "kb_variants"),
+		QObject::tr("Czech (US, Dvorak, UCW support)", "kb_variants"),
+		QObject::tr("Czech (with &lt;\|&gt; key)", "kb_variants"),
+		QObject::tr("Danish (Dvorak)", "kb_variants"),
+		QObject::tr("Danish (Macintosh)", "kb_variants"),
+		QObject::tr("Danish (Macintosh, no dead keys)", "kb_variants"),
+		QObject::tr("Danish (Windows)", "kb_variants"),
+		QObject::tr("Danish (no dead keys)", "kb_variants"),
+		QObject::tr("Dutch (Macintosh)", "kb_variants"),
+		QObject::tr("Dutch (Sun dead keys)", "kb_variants"),
+		QObject::tr("Dutch (standard)", "kb_variants"),
+		QObject::tr("English (Canada)", "kb_variants"),
+		QObject::tr("English (Colemak)", "kb_variants"),
+		QObject::tr("English (Dvorak)", "kb_variants"),
+		QObject::tr("English (Dvorak, alt. intl.)", "kb_variants"),
+		QObject::tr("English (Dvorak, intl., with dead keys)", "kb_variants"),
+		QObject::tr("English (Dvorak, left-handed)", "kb_variants"),
+		QObject::tr("English (Dvorak, right-handed)", "kb_variants"),
+		QObject::tr("English (Ghana, GILLBT)", "kb_variants"),
+		QObject::tr("English (Ghana, multilingual)", "kb_variants"),
+		QObject::tr("English (India, with rupee)", "kb_variants"),
+		QObject::tr("English (Macintosh)", "kb_variants"),
+		QObject::tr("English (Mali, US, Macintosh)", "kb_variants"),
+		QObject::tr("English (Mali, US, intl.)", "kb_variants"),
+		QObject::tr("English (Norman)", "kb_variants"),
+		QObject::tr("English (UK, Colemak)", "kb_variants"),
+		QObject::tr("English (UK, Dvorak)", "kb_variants"),
+		QObject::tr("English (UK, Dvorak, with UK punctuation)", "kb_variants"),
+		QObject::tr("English (UK, Macintosh)", "kb_variants"),
+		QObject::tr("English (UK, Macintosh, intl.)", "kb_variants"),
+		QObject::tr("English (UK, extended, Windows)", "kb_variants"),
+		QObject::tr("English (UK, intl., with dead keys)", "kb_variants"),
+		QObject::tr("English (US, Symbolic)", "kb_variants"),
+		QObject::tr("English (US, alt. intl.)", "kb_variants"),
+		QObject::tr("English (US, euro on 5)", "kb_variants"),
+		QObject::tr("English (US, intl., with dead keys)", "kb_variants"),
+		QObject::tr("English (Workman)", "kb_variants"),
+		QObject::tr("English (Workman, intl., with dead keys)", "kb_variants"),
+		QObject::tr("English (classic Dvorak)", "kb_variants"),
+		QObject::tr("English (intl., with AltGr dead keys)", "kb_variants"),
+		QObject::tr("English (programmer Dvorak)", "kb_variants"),
+		QObject::tr("English (the divide/multiply toggle the layout)", "kb_variants"),
+		QObject::tr("Esperanto (Brazil, Nativo)", "kb_variants"),
+		QObject::tr("Esperanto (Portugal, Nativo)", "kb_variants"),
+		QObject::tr("Esperanto (legacy)", "kb_variants"),
+		QObject::tr("Estonian (Dvorak)", "kb_variants"),
+		QObject::tr("Estonian (US)", "kb_variants"),
+		QObject::tr("Estonian (no dead keys)", "kb_variants"),
+		QObject::tr("Ewe", "kb_variants"),
+		QObject::tr("Faroese (no dead keys)", "kb_variants"),
+		QObject::tr("Filipino (Capewell-Dvorak, Baybayin)", "kb_variants"),
+		QObject::tr("Filipino (Capewell-Dvorak, Latin)", "kb_variants"),
+		QObject::tr("Filipino (Capewell-QWERF 2006, Baybayin)", "kb_variants"),
+		QObject::tr("Filipino (Capewell-QWERF 2006, Latin)", "kb_variants"),
+		QObject::tr("Filipino (Colemak, Baybayin)", "kb_variants"),
+		QObject::tr("Filipino (Colemak, Latin)", "kb_variants"),
+		QObject::tr("Filipino (Dvorak, Baybayin)", "kb_variants"),
+		QObject::tr("Filipino (Dvorak, Latin)", "kb_variants"),
+		QObject::tr("Filipino (QWERTY, Baybayin)", "kb_variants"),
+		QObject::tr("Finnish (Macintosh)", "kb_variants"),
+		QObject::tr("Finnish (Windows)", "kb_variants"),
+		QObject::tr("Finnish (classic)", "kb_variants"),
+		QObject::tr("Finnish (classic, no dead keys)", "kb_variants"),
+		QObject::tr("French (AZERTY)", "kb_variants"),
+		QObject::tr("French (AZERTY, AFNOR)", "kb_variants"),
+		QObject::tr("French (BEPO)", "kb_variants"),
+		QObject::tr("French (BEPO, AFNOR)", "kb_variants"),
+		QObject::tr("French (BEPO, Latin-9 only)", "kb_variants"),
+		QObject::tr("French (Breton)", "kb_variants"),
+		QObject::tr("French (Cameroon)", "kb_variants"),
+		QObject::tr("French (Canada, Dvorak)", "kb_variants"),
+		QObject::tr("French (Canada, legacy)", "kb_variants"),
+		QObject::tr("French (Dvorak)", "kb_variants"),
+		QObject::tr("French (Macintosh)", "kb_variants"),
+		QObject::tr("French (Mali, alt.)", "kb_variants"),
+		QObject::tr("French (Morocco)", "kb_variants"),
+		QObject::tr("French (Sun dead keys)", "kb_variants"),
+		QObject::tr("French (Switzerland)", "kb_variants"),
+		QObject::tr("French (Switzerland, Macintosh)", "kb_variants"),
+		QObject::tr("French (Switzerland, Sun dead keys)", "kb_variants"),
+		QObject::tr("French (Switzerland, no dead keys)", "kb_variants"),
+		QObject::tr("French (US)", "kb_variants"),
+		QObject::tr("French (alt.)", "kb_variants"),
+		QObject::tr("French (alt., Latin-9 only)", "kb_variants"),
+		QObject::tr("French (alt., Sun dead keys)", "kb_variants"),
+		QObject::tr("French (alt., no dead keys)", "kb_variants"),
+		QObject::tr("French (legacy, alt.)", "kb_variants"),
+		QObject::tr("French (legacy, alt., Sun dead keys)", "kb_variants"),
+		QObject::tr("French (legacy, alt., no dead keys)", "kb_variants"),
+		QObject::tr("French (no dead keys)", "kb_variants"),
+		QObject::tr("Friulian (Italy)", "kb_variants"),
+		QObject::tr("Fula", "kb_variants"),
+		QObject::tr("Ga", "kb_variants"),
+		QObject::tr("Georgian (France, AZERTY Tskapo)", "kb_variants"),
+		QObject::tr("Georgian (Italy)", "kb_variants"),
+		QObject::tr("Georgian (MESS)", "kb_variants"),
+		QObject::tr("Georgian (ergonomic)", "kb_variants"),
+		QObject::tr("German (Austria, Macintosh)", "kb_variants"),
+		QObject::tr("German (Austria, Sun dead keys)", "kb_variants"),
+		QObject::tr("German (Austria, no dead keys)", "kb_variants"),
+		QObject::tr("German (Dvorak)", "kb_variants"),
+		QObject::tr("German (E1)", "kb_variants"),
+		QObject::tr("German (E2)", "kb_variants"),
+		QObject::tr("German (Macintosh)", "kb_variants"),
+		QObject::tr("German (Macintosh, no dead keys)", "kb_variants"),
+		QObject::tr("German (Neo 2)", "kb_variants"),
+		QObject::tr("German (QWERTY)", "kb_variants"),
+		QObject::tr("German (Sun dead keys)", "kb_variants"),
+		QObject::tr("German (Switzerland, Macintosh)", "kb_variants"),
+		QObject::tr("German (Switzerland, Sun dead keys)", "kb_variants"),
+		QObject::tr("German (Switzerland, legacy)", "kb_variants"),
+		QObject::tr("German (Switzerland, no dead keys)", "kb_variants"),
+		QObject::tr("German (T3)", "kb_variants"),
+		QObject::tr("German (US)", "kb_variants"),
+		QObject::tr("German (dead acute)", "kb_variants"),
+		QObject::tr("German (dead grave acute)", "kb_variants"),
+		QObject::tr("German (dead tilde)", "kb_variants"),
+		QObject::tr("German (no dead keys)", "kb_variants"),
+		QObject::tr("Greek (extended)", "kb_variants"),
+		QObject::tr("Greek (no dead keys)", "kb_variants"),
+		QObject::tr("Greek (polytonic)", "kb_variants"),
+		QObject::tr("Greek (simple)", "kb_variants"),
+		QObject::tr("Gujarati", "kb_variants"),
+		QObject::tr("Hanyu Pinyin (with AltGr dead keys)", "kb_variants"),
+		QObject::tr("Hausa (Ghana)", "kb_variants"),
+		QObject::tr("Hausa (Nigeria)", "kb_variants"),
+		QObject::tr("Hawaiian", "kb_variants"),
+		QObject::tr("Hebrew (Biblical, Tiro)", "kb_variants"),
+		QObject::tr("Hebrew (lyx)", "kb_variants"),
+		QObject::tr("Hebrew (phonetic)", "kb_variants"),
+		QObject::tr("Hindi (Bolnagri)", "kb_variants"),
+		QObject::tr("Hindi (KaGaPa, phonetic)", "kb_variants"),
+		QObject::tr("Hindi (Wx)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTY)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTY, 101-key, comma, dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTY, 101-key, comma, no dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTY, 101-key, dot, dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTY, 101-key, dot, no dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTY, 102-key, comma, dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTY, 102-key, comma, no dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTY, 102-key, dot, dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTY, 102-key, dot, no dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTZ, 101-key, comma, dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTZ, 101-key, comma, no dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTZ, 101-key, dot, dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTZ, 101-key, dot, no dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTZ, 102-key, comma, dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTZ, 102-key, comma, no dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTZ, 102-key, dot, dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (QWERTZ, 102-key, dot, no dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (no dead keys)", "kb_variants"),
+		QObject::tr("Hungarian (standard)", "kb_variants"),
+		QObject::tr("Icelandic (Dvorak)", "kb_variants"),
+		QObject::tr("Icelandic (Macintosh)", "kb_variants"),
+		QObject::tr("Icelandic (Macintosh, legacy)", "kb_variants"),
+		QObject::tr("Icelandic (Sun dead keys)", "kb_variants"),
+		QObject::tr("Icelandic (no dead keys)", "kb_variants"),
+		QObject::tr("Igbo", "kb_variants"),
+		QObject::tr("Indic (phonetic, IPA)", "kb_variants"),
+		QObject::tr("Indonesian (Arab Melayu, extended phonetic)", "kb_variants"),
+		QObject::tr("Inuktitut", "kb_variants"),
+		QObject::tr("Irish (UnicodeExpert)", "kb_variants"),
+		QObject::tr("Italian (IBM 142)", "kb_variants"),
+		QObject::tr("Italian (Macintosh)", "kb_variants"),
+		QObject::tr("Italian (US)", "kb_variants"),
+		QObject::tr("Italian (Windows)", "kb_variants"),
+		QObject::tr("Italian (intl., with dead keys)", "kb_variants"),
+		QObject::tr("Italian (no dead keys)", "kb_variants"),
+		QObject::tr("Japanese (Dvorak)", "kb_variants"),
+		QObject::tr("Japanese (Kana 86)", "kb_variants"),
+		QObject::tr("Japanese (Kana)", "kb_variants"),
+		QObject::tr("Japanese (Macintosh)", "kb_variants"),
+		QObject::tr("Japanese (OADG 109A)", "kb_variants"),
+		QObject::tr("Kabylian (Algeria, Tifinagh)", "kb_variants"),
+		QObject::tr("Kabylian (azerty layout, with dead keys)", "kb_variants"),
+		QObject::tr("Kabylian (qwerty-gb layout, with dead keys)", "kb_variants"),
+		QObject::tr("Kabylian (qwerty-us layout, with dead keys)", "kb_variants"),
+		QObject::tr("Kalmyk", "kb_variants"),
+		QObject::tr("Kannada", "kb_variants"),
+		QObject::tr("Kannada (KaGaPa, phonetic)", "kb_variants"),
+		QObject::tr("Kashubian", "kb_variants"),
+		QObject::tr("Kazakh (Latin)", "kb_variants"),
+		QObject::tr("Kazakh (extended)", "kb_variants"),
+		QObject::tr("Kazakh (with Russian)", "kb_variants"),
+		QObject::tr("Kikuyu", "kb_variants"),
+		QObject::tr("Komi", "kb_variants"),
+		QObject::tr("Korean (101/104-key compatible)", "kb_variants"),
+		QObject::tr("Kurdish (Iran, Arabic-Latin)", "kb_variants"),
+		QObject::tr("Kurdish (Iran, F)", "kb_variants"),
+		QObject::tr("Kurdish (Iran, Latin Alt-Q)", "kb_variants"),
+		QObject::tr("Kurdish (Iran, Latin Q)", "kb_variants"),
+		QObject::tr("Kurdish (Iraq, Arabic-Latin)", "kb_variants"),
+		QObject::tr("Kurdish (Iraq, F)", "kb_variants"),
+		QObject::tr("Kurdish (Iraq, Latin Alt-Q)", "kb_variants"),
+		QObject::tr("Kurdish (Iraq, Latin Q)", "kb_variants"),
+		QObject::tr("Kurdish (Syria, F)", "kb_variants"),
+		QObject::tr("Kurdish (Syria, Latin Alt-Q)", "kb_variants"),
+		QObject::tr("Kurdish (Syria, Latin Q)", "kb_variants"),
+		QObject::tr("Kurdish (Turkey, F)", "kb_variants"),
+		QObject::tr("Kurdish (Turkey, Latin Alt-Q)", "kb_variants"),
+		QObject::tr("Kurdish (Turkey, Latin Q)", "kb_variants"),
+		QObject::tr("Kyrgyz (phonetic)", "kb_variants"),
+		QObject::tr("Lao (STEA)", "kb_variants"),
+		QObject::tr("Latvian (F)", "kb_variants"),
+		QObject::tr("Latvian (adapted)", "kb_variants"),
+		QObject::tr("Latvian (apostrophe)", "kb_variants"),
+		QObject::tr("Latvian (ergonomic, ŪGJRMV)", "kb_variants"),
+		QObject::tr("Latvian (modern)", "kb_variants"),
+		QObject::tr("Latvian (tilde)", "kb_variants"),
+		QObject::tr("Lithuanian (IBM LST 1205-92)", "kb_variants"),
+		QObject::tr("Lithuanian (LEKP)", "kb_variants"),
+		QObject::tr("Lithuanian (LEKPa)", "kb_variants"),
+		QObject::tr("Lithuanian (US)", "kb_variants"),
+		QObject::tr("Lithuanian (standard)", "kb_variants"),
+		QObject::tr("Lower Sorbian", "kb_variants"),
+		QObject::tr("Lower Sorbian (QWERTZ)", "kb_variants"),
+		QObject::tr("Macedonian (no dead keys)", "kb_variants"),
+		QObject::tr("Malay (Jawi, phonetic)", "kb_variants"),
+		QObject::tr("Malayalam", "kb_variants"),
+		QObject::tr("Malayalam (Lalitha)", "kb_variants"),
+		QObject::tr("Malayalam (enhanced Inscript, with rupee)", "kb_variants"),
+		QObject::tr("Maltese (UK, with AltGr overrides)", "kb_variants"),
+		QObject::tr("Maltese (US layout with AltGr overrides)", "kb_variants"),
+		QObject::tr("Maltese (US)", "kb_variants"),
+		QObject::tr("Manipuri (Eeyek)", "kb_variants"),
+		QObject::tr("Marathi (KaGaPa, phonetic)", "kb_variants"),
+		QObject::tr("Marathi (enhanced Inscript)", "kb_variants"),
+		QObject::tr("Mari", "kb_variants"),
+		QObject::tr("Mmuock", "kb_variants"),
+		QObject::tr("Moldavian (Gagauz)", "kb_variants"),
+		QObject::tr("Mongolian (Bichig)", "kb_variants"),
+		QObject::tr("Mongolian (Galik)", "kb_variants"),
+		QObject::tr("Mongolian (Manchu Galik)", "kb_variants"),
+		QObject::tr("Mongolian (Manchu)", "kb_variants"),
+		QObject::tr("Mongolian (Todo Galik)", "kb_variants"),
+		QObject::tr("Mongolian (Todo)", "kb_variants"),
+		QObject::tr("Mongolian (Xibe)", "kb_variants"),
+		QObject::tr("Montenegrin (Cyrillic)", "kb_variants"),
+		QObject::tr("Montenegrin (Cyrillic, ZE and ZHE swapped)", "kb_variants"),
+		QObject::tr("Montenegrin (Cyrillic, with guillemets)", "kb_variants"),
+		QObject::tr("Montenegrin (Latin, QWERTY)", "kb_variants"),
+		QObject::tr("Montenegrin (Latin, Unicode)", "kb_variants"),
+		QObject::tr("Montenegrin (Latin, Unicode, QWERTY)", "kb_variants"),
+		QObject::tr("Montenegrin (Latin, with guillemets)", "kb_variants"),
+		QObject::tr("Northern Saami (Finland)", "kb_variants"),
+		QObject::tr("Northern Saami (Norway)", "kb_variants"),
+		QObject::tr("Northern Saami (Norway, no dead keys)", "kb_variants"),
+		QObject::tr("Northern Saami (Sweden)", "kb_variants"),
+		QObject::tr("Norwegian (Colemak)", "kb_variants"),
+		QObject::tr("Norwegian (Dvorak)", "kb_variants"),
+		QObject::tr("Norwegian (Macintosh)", "kb_variants"),
+		QObject::tr("Norwegian (Macintosh, no dead keys)", "kb_variants"),
+		QObject::tr("Norwegian (Windows)", "kb_variants"),
+		QObject::tr("Norwegian (no dead keys)", "kb_variants"),
+		QObject::tr("Occitan", "kb_variants"),
+		QObject::tr("Ogham", "kb_variants"),
+		QObject::tr("Ogham (IS434)", "kb_variants"),
+		QObject::tr("Ol Chiki", "kb_variants"),
+		QObject::tr("Oriya", "kb_variants"),
+		QObject::tr("Ossetian (Georgia)", "kb_variants"),
+		QObject::tr("Ossetian (Windows)", "kb_variants"),
+		QObject::tr("Ossetian (legacy)", "kb_variants"),
+		QObject::tr("Pannonian Rusyn", "kb_variants"),
+		QObject::tr("Pashto", "kb_variants"),
+		QObject::tr("Pashto (Afghanistan, OLPC)", "kb_variants"),
+		QObject::tr("Persian (Afghanistan, Dari OLPC)", "kb_variants"),
+		QObject::tr("Persian (with Persian keypad)", "kb_variants"),
+		QObject::tr("Polish (British keyboard)", "kb_variants"),
+		QObject::tr("Polish (Dvorak)", "kb_variants"),
+		QObject::tr("Polish (Dvorak, with Polish quotes on key 1)", "kb_variants"),
+		QObject::tr("Polish (Dvorak, with Polish quotes on quotemark key)", "kb_variants"),
+		QObject::tr("Polish (QWERTZ)", "kb_variants"),
+		QObject::tr("Polish (legacy)", "kb_variants"),
+		QObject::tr("Polish (programmer Dvorak)", "kb_variants"),
+		QObject::tr("Portuguese (Brazil, Dvorak)", "kb_variants"),
+		QObject::tr("Portuguese (Brazil, IBM/Lenovo ThinkPad)", "kb_variants"),
+		QObject::tr("Portuguese (Brazil, Nativo for US keyboards)", "kb_variants"),
+		QObject::tr("Portuguese (Brazil, Nativo)", "kb_variants"),
+		QObject::tr("Portuguese (Brazil, no dead keys)", "kb_variants"),
+		QObject::tr("Portuguese (Macintosh)", "kb_variants"),
+		QObject::tr("Portuguese (Macintosh, Sun dead keys)", "kb_variants"),
+		QObject::tr("Portuguese (Macintosh, no dead keys)", "kb_variants"),
+		QObject::tr("Portuguese (Nativo for US keyboards)", "kb_variants"),
+		QObject::tr("Portuguese (Nativo)", "kb_variants"),
+		QObject::tr("Portuguese (Sun dead keys)", "kb_variants"),
+		QObject::tr("Portuguese (no dead keys)", "kb_variants"),
+		QObject::tr("Punjabi (Gurmukhi Jhelum)", "kb_variants"),
+		QObject::tr("Punjabi (Gurmukhi)", "kb_variants"),
+		QObject::tr("Romanian (Germany)", "kb_variants"),
+		QObject::tr("Romanian (Germany, no dead keys)", "kb_variants"),
+		QObject::tr("Romanian (Windows)", "kb_variants"),
+		QObject::tr("Romanian (cedilla)", "kb_variants"),
+		QObject::tr("Romanian (standard cedilla)", "kb_variants"),
+		QObject::tr("Romanian (standard)", "kb_variants"),
+		QObject::tr("Russian (Belarus)", "kb_variants"),
+		QObject::tr("Russian (Czech, phonetic)", "kb_variants"),
+		QObject::tr("Russian (DOS)", "kb_variants"),
+		QObject::tr("Russian (Georgia)", "kb_variants"),
+		QObject::tr("Russian (Germany, phonetic)", "kb_variants"),
+		QObject::tr("Russian (Kazakhstan, with Kazakh)", "kb_variants"),
+		QObject::tr("Russian (Macintosh)", "kb_variants"),
+		QObject::tr("Russian (Poland, phonetic Dvorak)", "kb_variants"),
+		QObject::tr("Russian (Sweden, phonetic)", "kb_variants"),
+		QObject::tr("Russian (Sweden, phonetic, no dead keys)", "kb_variants"),
+		QObject::tr("Russian (US, phonetic)", "kb_variants"),
+		QObject::tr("Russian (Ukraine, standard RSTU)", "kb_variants"),
+		QObject::tr("Russian (legacy)", "kb_variants"),
+		QObject::tr("Russian (phonetic)", "kb_variants"),
+		QObject::tr("Russian (phonetic, AZERTY)", "kb_variants"),
+		QObject::tr("Russian (phonetic, Dvorak)", "kb_variants"),
+		QObject::tr("Russian (phonetic, French)", "kb_variants"),
+		QObject::tr("Russian (phonetic, Windows)", "kb_variants"),
+		QObject::tr("Russian (phonetic, YAZHERTY)", "kb_variants"),
+		QObject::tr("Russian (typewriter)", "kb_variants"),
+		QObject::tr("Russian (typewriter, legacy)", "kb_variants"),
+		QObject::tr("Saisiyat (Taiwan)", "kb_variants"),
+		QObject::tr("Samogitian", "kb_variants"),
+		QObject::tr("Sanskrit (KaGaPa, phonetic)", "kb_variants"),
+		QObject::tr("Serbian (Cyrillic, ZE and ZHE swapped)", "kb_variants"),
+		QObject::tr("Serbian (Cyrillic, with guillemets)", "kb_variants"),
+		QObject::tr("Serbian (Latin)", "kb_variants"),
+		QObject::tr("Serbian (Latin, QWERTY)", "kb_variants"),
+		QObject::tr("Serbian (Latin, Unicode)", "kb_variants"),
+		QObject::tr("Serbian (Latin, Unicode, QWERTY)", "kb_variants"),
+		QObject::tr("Serbian (Latin, with guillemets)", "kb_variants"),
+		QObject::tr("Serbian (Russia)", "kb_variants"),
+		QObject::tr("Serbo-Croatian (US)", "kb_variants"),
+		QObject::tr("Sicilian", "kb_variants"),
+		QObject::tr("Silesian", "kb_variants"),
+		QObject::tr("Sindhi", "kb_variants"),
+		QObject::tr("Sinhala (US)", "kb_variants"),
+		QObject::tr("Slovak (QWERTY)", "kb_variants"),
+		QObject::tr("Slovak (QWERTY, extended backslash)", "kb_variants"),
+		QObject::tr("Slovak (extended backslash)", "kb_variants"),
+		QObject::tr("Slovenian (US)", "kb_variants"),
+		QObject::tr("Slovenian (with guillemets)", "kb_variants"),
+		QObject::tr("Spanish (Dvorak)", "kb_variants"),
+		QObject::tr("Spanish (Latin American, Colemak for gaming)", "kb_variants"),
+		QObject::tr("Spanish (Latin American, Colemak)", "kb_variants"),
+		QObject::tr("Spanish (Latin American, Dvorak)", "kb_variants"),
+		QObject::tr("Spanish (Latin American, Sun dead keys)", "kb_variants"),
+		QObject::tr("Spanish (Latin American, dead tilde)", "kb_variants"),
+		QObject::tr("Spanish (Latin American, no dead keys)", "kb_variants"),
+		QObject::tr("Spanish (Macintosh)", "kb_variants"),
+		QObject::tr("Spanish (Sun dead keys)", "kb_variants"),
+		QObject::tr("Spanish (Windows)", "kb_variants"),
+		QObject::tr("Spanish (dead tilde)", "kb_variants"),
+		QObject::tr("Spanish (no dead keys)", "kb_variants"),
+		QObject::tr("Swedish (Dvorak)", "kb_variants"),
+		QObject::tr("Swedish (Dvorak, intl.)", "kb_variants"),
+		QObject::tr("Swedish (Macintosh)", "kb_variants"),
+		QObject::tr("Swedish (Svdvorak)", "kb_variants"),
+		QObject::tr("Swedish (US)", "kb_variants"),
+		QObject::tr("Swedish (no dead keys)", "kb_variants"),
+		QObject::tr("Swedish Sign Language", "kb_variants"),
+		QObject::tr("Syriac", "kb_variants"),
+		QObject::tr("Syriac (phonetic)", "kb_variants"),
+		QObject::tr("Taiwanese (indigenous)", "kb_variants"),
+		QObject::tr("Tajik (legacy)", "kb_variants"),
+		QObject::tr("Tamil (Inscript)", "kb_variants"),
+		QObject::tr("Tamil (Sri Lanka, TamilNet '99)", "kb_variants"),
+		QObject::tr("Tamil (Sri Lanka, TamilNet '99, TAB encoding)", "kb_variants"),
+		QObject::tr("Tamil (TamilNet '99 with Tamil numerals)", "kb_variants"),
+		QObject::tr("Tamil (TamilNet '99)", "kb_variants"),
+		QObject::tr("Tamil (TamilNet '99, TAB encoding)", "kb_variants"),
+		QObject::tr("Tamil (TamilNet '99, TSCII encoding)", "kb_variants"),
+		QObject::tr("Tatar", "kb_variants"),
+		QObject::tr("Telugu", "kb_variants"),
+		QObject::tr("Telugu (KaGaPa, phonetic)", "kb_variants"),
+		QObject::tr("Telugu (Sarala)", "kb_variants"),
+		QObject::tr("Thai (Pattachote)", "kb_variants"),
+		QObject::tr("Thai (TIS-820.2538)", "kb_variants"),
+		QObject::tr("Tibetan", "kb_variants"),
+		QObject::tr("Tibetan (with ASCII numerals)", "kb_variants"),
+		QObject::tr("Turkish (Alt-Q)", "kb_variants"),
+		QObject::tr("Turkish (F)", "kb_variants"),
+		QObject::tr("Turkish (Germany)", "kb_variants"),
+		QObject::tr("Turkish (Sun dead keys)", "kb_variants"),
+		QObject::tr("Turkish (intl., with dead keys)", "kb_variants"),
+		QObject::tr("Turkmen (Alt-Q)", "kb_variants"),
+		QObject::tr("Udmurt", "kb_variants"),
+		QObject::tr("Ukrainian (Windows)", "kb_variants"),
+		QObject::tr("Ukrainian (homophonic)", "kb_variants"),
+		QObject::tr("Ukrainian (legacy)", "kb_variants"),
+		QObject::tr("Ukrainian (phonetic)", "kb_variants"),
+		QObject::tr("Ukrainian (standard RSTU)", "kb_variants"),
+		QObject::tr("Ukrainian (typewriter)", "kb_variants"),
+		QObject::tr("Urdu (Pakistan, CRULP)", "kb_variants"),
+		QObject::tr("Urdu (Pakistan, NLA)", "kb_variants"),
+		QObject::tr("Urdu (Windows)", "kb_variants"),
+		QObject::tr("Urdu (alt. phonetic)", "kb_variants"),
+		QObject::tr("Urdu (phonetic)", "kb_variants"),
+		QObject::tr("Uyghur", "kb_variants"),
+		QObject::tr("Uzbek (Afghanistan)", "kb_variants"),
+		QObject::tr("Uzbek (Afghanistan, OLPC)", "kb_variants"),
+		QObject::tr("Uzbek (Latin)", "kb_variants"),
+		QObject::tr("Vietnamese (French)", "kb_variants"),
+		QObject::tr("Vietnamese (US)", "kb_variants"),
+		QObject::tr("Yakut", "kb_variants"),
+		QObject::tr("Yoruba", "kb_variants"),
+		QString()
+	};
+}
+
diff --git a/src/modules/keyboard/layout-extractor.py b/src/modules/keyboard/layout-extractor.py
new file mode 100644
index 000000000..74b42ea07
--- /dev/null
+++ b/src/modules/keyboard/layout-extractor.py
@@ -0,0 +1,94 @@
+#! /usr/bin/env python3
+#
+#  === This file is part of Calamares - <https://calamares.io> ===
+#
+#   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+#   SPDX-License-Identifier: BSD-2-Clause
+#
+"""
+Python3 script to scrape x keyboard layout file and produce translations.
+
+To use this script, you must have a base.lst in a standard location,
+/usr/local/share/X11/xkb/rules/base.lst (this is usual on FreeBSD).
+
+Prints out a few tables of keyboard model, layout, variant names for
+use in translations.
+"""
+
+def scrape_file(file, modelsset, layoutsset, variantsset):
+    import re
+    # These RE's match what is in keyboardglobal.cpp
+    model_re = re.compile("^\\s+(\\S+)\\s+(\\w.*)\n$")
+    layout_re = re.compile("^\\s+(\\S+)\\s+(\\w.*)\n$")
+    variant_re = re.compile("^\\s+(\\S+)\\s+(\\S+): (\\w.*)\n$")
+
+    MODEL, LAYOUT, VARIANT = range(3)
+    state = None
+    for line in file.readlines():
+        # Handle changes in section
+        if line.startswith("! model"):
+            state = MODEL
+            continue
+        elif line.startswith("! layout"):
+            state = LAYOUT
+            continue
+        elif line.startswith("! variant"):
+            state = VARIANT
+            continue
+        elif not line.strip():
+            state = None
+        # Unchanged from last blank
+        if state is None:
+            continue
+
+        if state == MODEL:
+            m = model_re.match(line)
+            name = m.groups()[1]
+            modelsset.add(name)
+        if state == LAYOUT:
+            l = layout_re.match(line)
+            name = l.groups()[1]
+            layoutsset.add(name)
+        if state == VARIANT:
+            v = variant_re.match(line)
+            name = v.groups()[2]
+            variantsset.add(name)
+
+
+def write_set(file, label, set):
+    file.write("/* This returns a reference to local, which is a terrible idea.\n * Good thing it's not meant to be compiled.\n */\n")
+    # Note {{ is an escaped { for Python string formatting
+    file.write("static const QStringList& {!s}_table()\n{{\n\treturn QStringList {{\n".format(label))
+    for x in sorted(set):
+        file.write("""\t\tQObject::tr("{!s}", "{!s}"),\n""".format(x, label))
+    file.write("\t\tQString()\n\t};\n}\n\n")
+
+cpp_header_comment = """/*   GENERATED FILE DO NOT EDIT
+*
+*  === This file is part of Calamares - <https://calamares.io> ===
+*
+* SPDX-FileCopyrightText: no
+* SPDX-License-Identifier: CC0-1.0
+*
+* This file is derived from base.lst in the Xorg distribution
+*
+*/
+
+/** THIS FILE EXISTS ONLY FOR TRANSLATIONS PURPOSES **/
+
+// *INDENT-OFF*
+// clang-format off
+"""
+
+if __name__ == "__main__":
+    models=set()
+    layouts=set()
+    variants=set()
+    with open("/usr/local/share/X11/xkb/rules/base.lst", "r") as f:
+        scrape_file(f, models, layouts, variants)
+    with open("KeyboardData_p.cxxtr", "w") as f:
+        f.write(cpp_header_comment)
+        write_set(f, "kb_models", models)
+        write_set(f, "kb_layouts", layouts)
+        write_set(f, "kb_variants", variants)
+

From 063fb24f3a0333886b96644da1c4ce8cfd72ae88 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 12:43:03 +0100
Subject: [PATCH 112/228] i18n: add translations source for keyboards

---
 ci/txpush.sh  |   11 +-
 lang/kb_en.ts | 4609 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 4618 insertions(+), 2 deletions(-)
 create mode 100644 lang/kb_en.ts

diff --git a/ci/txpush.sh b/ci/txpush.sh
index 363a234e8..ac806a2fa 100755
--- a/ci/txpush.sh
+++ b/ci/txpush.sh
@@ -92,9 +92,16 @@ done
 # those are done separately.
 _srcdirs="src/calamares src/libcalamares src/libcalamaresui src/modules src/qml"
 $LUPDATE -no-obsolete $_srcdirs -ts lang/calamares_en.ts
-# Updating the TZ only needs to happen when the TZ themselves are updated,
-# very-very-rarely.
+# Non-Transifex special-cases
+#
+# - timezone names can be translated, but that's 700+ strings I don't want
+#   to inflict on translators normally
+# - keyboard layouts can be translated, but that's 767 strings
+#
+# For both of these, the language / translation only needs to be updated
+# when the source data is updated, which is very very rarely.
 # $LUPDATE -no-obsolete -extensions cxxtr src/libcalamares/locale -ts lang/tz_en.ts
+# $LUPDATE -no-obsolete -extensions cxxtr src/modules/keyboard -ts lang/kb_en.ts
 
 if test -n "$XMLLINT" ; then
 	TS_FILE="lang/calamares_en.ts"
diff --git a/lang/kb_en.ts b/lang/kb_en.ts
new file mode 100644
index 000000000..11e29c61a
--- /dev/null
+++ b/lang/kb_en.ts
@@ -0,0 +1,4609 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="22"/>
+        <source>A4Tech KB-21</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="23"/>
+        <source>A4Tech KBS-8</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="24"/>
+        <source>A4Tech Wireless Desktop RFKB-23</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="25"/>
+        <source>Acer AirKey V</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="26"/>
+        <source>Acer C300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="27"/>
+        <source>Acer Ferrari 4000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="28"/>
+        <source>Acer laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="29"/>
+        <source>Advance Scorpius KI</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="30"/>
+        <source>Apple</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="31"/>
+        <source>Apple Aluminium (ANSI)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="32"/>
+        <source>Apple Aluminium (ISO)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="33"/>
+        <source>Apple Aluminium (JIS)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="34"/>
+        <source>Apple laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="35"/>
+        <source>Asus laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="36"/>
+        <source>Azona RF2300 wireless Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="37"/>
+        <source>BTC 5090</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="38"/>
+        <source>BTC 5113RF Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="39"/>
+        <source>BTC 5126T</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="40"/>
+        <source>BTC 6301URF</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="41"/>
+        <source>BTC 9000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="42"/>
+        <source>BTC 9000A</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="43"/>
+        <source>BTC 9001AH</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="44"/>
+        <source>BTC 9019U</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="45"/>
+        <source>BTC 9116U Mini Wireless Internet and Gaming</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="46"/>
+        <source>BenQ X-Touch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="47"/>
+        <source>BenQ X-Touch 730</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="48"/>
+        <source>BenQ X-Touch 800</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="49"/>
+        <source>Brother Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="50"/>
+        <source>Cherry B.UNLIMITED</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="51"/>
+        <source>Cherry Blue Line CyBo@rd</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="52"/>
+        <source>Cherry Blue Line CyBo@rd (alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="53"/>
+        <source>Cherry CyBo@rd USB-Hub</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="54"/>
+        <source>Cherry CyMotion Expert</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="55"/>
+        <source>Cherry CyMotion Master Linux</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="56"/>
+        <source>Cherry CyMotion Master XPress</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="57"/>
+        <source>Chicony Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="58"/>
+        <source>Chicony KB-9885</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="59"/>
+        <source>Chicony KU-0108</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="60"/>
+        <source>Chicony KU-0420</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="61"/>
+        <source>Chromebook</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="62"/>
+        <source>Classmate PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="63"/>
+        <source>Compaq Armada laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="64"/>
+        <source>Compaq Easy Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="65"/>
+        <source>Compaq Internet (13 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="66"/>
+        <source>Compaq Internet (18 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="67"/>
+        <source>Compaq Internet (7 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="68"/>
+        <source>Compaq Presario laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="69"/>
+        <source>Compaq iPaq</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="70"/>
+        <source>Creative Desktop Wireless 7000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="71"/>
+        <source>DTK2000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="72"/>
+        <source>Dell</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="73"/>
+        <source>Dell 101-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="74"/>
+        <source>Dell Inspiron 6000/8000 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="75"/>
+        <source>Dell Latitude laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="76"/>
+        <source>Dell Precision M laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="77"/>
+        <source>Dell Precision M65 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="78"/>
+        <source>Dell SK-8125</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="79"/>
+        <source>Dell SK-8135</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="80"/>
+        <source>Dell USB Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="81"/>
+        <source>Dexxa Wireless Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="82"/>
+        <source>Diamond 9801/9802</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="83"/>
+        <source>Ennyah DKB-1008</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="84"/>
+        <source>Everex STEPnote</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="85"/>
+        <source>FL90</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="86"/>
+        <source>Fujitsu-Siemens Amilo laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="87"/>
+        <source>Generic 101-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="88"/>
+        <source>Generic 102-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="89"/>
+        <source>Generic 104-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="90"/>
+        <source>Generic 104-key PC with L-shaped Enter key</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="91"/>
+        <source>Generic 105-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="92"/>
+        <source>Generic 86-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="93"/>
+        <source>Genius Comfy KB-12e</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="94"/>
+        <source>Genius Comfy KB-16M/Multimedia KWD-910</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="95"/>
+        <source>Genius Comfy KB-21e-Scroll</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="96"/>
+        <source>Genius KB-19e NB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="97"/>
+        <source>Genius KKB-2050HS</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="98"/>
+        <source>Gyration</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="99"/>
+        <source>Happy Hacking</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="100"/>
+        <source>Happy Hacking for Mac</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="101"/>
+        <source>Hewlett-Packard Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="102"/>
+        <source>Hewlett-Packard Mini 110 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="103"/>
+        <source>Hewlett-Packard NEC SK-2500 Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="104"/>
+        <source>Hewlett-Packard Omnibook 500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="105"/>
+        <source>Hewlett-Packard Omnibook 500 FA</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="106"/>
+        <source>Hewlett-Packard Omnibook 6000/6100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="107"/>
+        <source>Hewlett-Packard Omnibook XE3 GC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="108"/>
+        <source>Hewlett-Packard Omnibook XE3 GF</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="109"/>
+        <source>Hewlett-Packard Omnibook XT1000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="110"/>
+        <source>Hewlett-Packard Pavilion ZT1100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="111"/>
+        <source>Hewlett-Packard Pavilion dv5</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="112"/>
+        <source>Hewlett-Packard nx9020</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="113"/>
+        <source>Honeywell Euroboard</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="114"/>
+        <source>IBM Rapid Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="115"/>
+        <source>IBM Rapid Access II</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="116"/>
+        <source>IBM Space Saver</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="117"/>
+        <source>IBM ThinkPad 560Z/600/600E/A22E</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="118"/>
+        <source>IBM ThinkPad R60/T60/R61/T61</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="119"/>
+        <source>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="120"/>
+        <source>Keytronic FlexPro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="121"/>
+        <source>Kinesis</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="122"/>
+        <source>Logitech</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="123"/>
+        <source>Logitech Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="124"/>
+        <source>Logitech Cordless Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="125"/>
+        <source>Logitech Cordless Desktop (alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="126"/>
+        <source>Logitech Cordless Desktop EX110</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="127"/>
+        <source>Logitech Cordless Desktop LX-300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="128"/>
+        <source>Logitech Cordless Desktop Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="129"/>
+        <source>Logitech Cordless Desktop Optical</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="130"/>
+        <source>Logitech Cordless Desktop Pro (2nd alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="131"/>
+        <source>Logitech Cordless Desktop iTouch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="132"/>
+        <source>Logitech Cordless Freedom/Desktop Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="133"/>
+        <source>Logitech G15 extra keys via G15daemon</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="134"/>
+        <source>Logitech Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="135"/>
+        <source>Logitech Internet 350</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="136"/>
+        <source>Logitech Internet Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="137"/>
+        <source>Logitech Ultra-X</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="138"/>
+        <source>Logitech Ultra-X Cordless Media Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="139"/>
+        <source>Logitech diNovo</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="140"/>
+        <source>Logitech diNovo Edge</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="141"/>
+        <source>Logitech iTouch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="142"/>
+        <source>Logitech iTouch Cordless Y-RB6</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="143"/>
+        <source>Logitech iTouch Internet Navigator SE</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="144"/>
+        <source>Logitech iTouch Internet Navigator SE USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="145"/>
+        <source>MacBook/MacBook Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="146"/>
+        <source>MacBook/MacBook Pro (intl.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="147"/>
+        <source>Macintosh</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="148"/>
+        <source>Macintosh Old</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="149"/>
+        <source>Memorex MX1998</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="150"/>
+        <source>Memorex MX2500 EZ-Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="151"/>
+        <source>Memorex MX2750</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="152"/>
+        <source>Microsoft Comfort Curve 2000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="153"/>
+        <source>Microsoft Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="154"/>
+        <source>Microsoft Internet Pro (Swedish)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="155"/>
+        <source>Microsoft Natural</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="156"/>
+        <source>Microsoft Natural Elite</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="157"/>
+        <source>Microsoft Natural Ergonomic 4000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="158"/>
+        <source>Microsoft Natural Pro OEM</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="159"/>
+        <source>Microsoft Natural Pro USB/Internet Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="160"/>
+        <source>Microsoft Natural Pro/Internet Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="161"/>
+        <source>Microsoft Natural Wireless Ergonomic 7000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="162"/>
+        <source>Microsoft Office Keyboard</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="163"/>
+        <source>Microsoft Surface</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="164"/>
+        <source>Microsoft Wireless Multimedia 1.0A</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="165"/>
+        <source>NEC SK-1300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="166"/>
+        <source>NEC SK-2500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="167"/>
+        <source>NEC SK-6200</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="168"/>
+        <source>NEC SK-7100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="169"/>
+        <source>Northgate OmniKey 101</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="170"/>
+        <source>OLPC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="171"/>
+        <source>Ortek Multimedia/Internet MCK-800</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="172"/>
+        <source>PC-98</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="173"/>
+        <source>Propeller Voyager KTEZ-1000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="174"/>
+        <source>QTronix Scorpius 98N+</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="175"/>
+        <source>SVEN Ergonomic 2500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="176"/>
+        <source>SVEN Slim 303</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="177"/>
+        <source>Samsung SDM 4500P</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="178"/>
+        <source>Samsung SDM 4510P</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="179"/>
+        <source>Sanwa Supply SKB-KG3</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="180"/>
+        <source>Silvercrest Multimedia Wireless</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="181"/>
+        <source>SteelSeries Apex 300 (Apex RAW)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="182"/>
+        <source>Sun Type 6 (Japanese)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="183"/>
+        <source>Sun Type 6 USB (Japanese)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="184"/>
+        <source>Sun Type 6 USB (Unix)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="185"/>
+        <source>Sun Type 6/7 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="186"/>
+        <source>Sun Type 6/7 USB (European)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="187"/>
+        <source>Sun Type 7 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="188"/>
+        <source>Sun Type 7 USB (European)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="189"/>
+        <source>Sun Type 7 USB (Japanese)/Japanese 106-key</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="190"/>
+        <source>Sun Type 7 USB (Unix)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="191"/>
+        <source>Super Power Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="192"/>
+        <source>Symplon PaceBook tablet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="193"/>
+        <source>Targa Visionary 811</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="194"/>
+        <source>Toshiba Satellite S3000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="195"/>
+        <source>Truly Ergonomic 227</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="196"/>
+        <source>Truly Ergonomic 229</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="197"/>
+        <source>Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="198"/>
+        <source>Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="199"/>
+        <source>Trust Direct Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="200"/>
+        <source>Trust Slimline</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="201"/>
+        <source>Trust Wireless Classic</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="202"/>
+        <source>TypeMatrix EZ-Reach 2020</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="203"/>
+        <source>TypeMatrix EZ-Reach 2030 PS2</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="204"/>
+        <source>TypeMatrix EZ-Reach 2030 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="205"/>
+        <source>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="206"/>
+        <source>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="207"/>
+        <source>Unitek KB-1925</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="208"/>
+        <source>ViewSonic KU-306 Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="209"/>
+        <source>Winbook Model XP5</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="210"/>
+        <source>Yahoo! Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="211"/>
+        <source>eMachines m6800 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="222"/>
+        <source>Afghani</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="223"/>
+        <source>Albanian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="224"/>
+        <source>Amharic</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="225"/>
+        <source>Arabic</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="226"/>
+        <source>Arabic (Morocco)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="227"/>
+        <source>Arabic (Syria)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="228"/>
+        <source>Armenian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="229"/>
+        <source>Azerbaijani</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="230"/>
+        <source>Bambara</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="231"/>
+        <source>Bangla</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="232"/>
+        <source>Belarusian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="233"/>
+        <source>Belgian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="234"/>
+        <source>Bosnian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="235"/>
+        <source>Braille</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="236"/>
+        <source>Bulgarian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="237"/>
+        <source>Burmese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="238"/>
+        <source>Chinese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="239"/>
+        <source>Croatian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="240"/>
+        <source>Czech</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="241"/>
+        <source>Danish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="242"/>
+        <source>Dhivehi</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="243"/>
+        <source>Dutch</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="244"/>
+        <source>Dzongkha</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="245"/>
+        <source>English (Australian)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="246"/>
+        <source>English (Cameroon)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="247"/>
+        <source>English (Ghana)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="248"/>
+        <source>English (Nigeria)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="249"/>
+        <source>English (South Africa)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="250"/>
+        <source>English (UK)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="251"/>
+        <source>English (US)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="252"/>
+        <source>Esperanto</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="253"/>
+        <source>Estonian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="254"/>
+        <source>Faroese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="255"/>
+        <source>Filipino</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="256"/>
+        <source>Finnish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="257"/>
+        <source>French</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="258"/>
+        <source>French (Canada)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="259"/>
+        <source>French (Democratic Republic of the Congo)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="260"/>
+        <source>French (Guinea)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="261"/>
+        <source>French (Togo)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="262"/>
+        <source>Georgian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="263"/>
+        <source>German</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="264"/>
+        <source>German (Austria)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="265"/>
+        <source>German (Switzerland)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="266"/>
+        <source>Greek</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="267"/>
+        <source>Hebrew</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="268"/>
+        <source>Hungarian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="269"/>
+        <source>Icelandic</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="270"/>
+        <source>Indian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="271"/>
+        <source>Indonesian (Arab Melayu, phonetic)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="272"/>
+        <source>Indonesian (Javanese)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="273"/>
+        <source>Iraqi</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="274"/>
+        <source>Irish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="275"/>
+        <source>Italian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="276"/>
+        <source>Japanese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="277"/>
+        <source>Japanese (PC-98)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="278"/>
+        <source>Kabylian (azerty layout, no dead keys)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="279"/>
+        <source>Kazakh</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="280"/>
+        <source>Khmer (Cambodia)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="281"/>
+        <source>Korean</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="282"/>
+        <source>Kyrgyz</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="283"/>
+        <source>Lao</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="284"/>
+        <source>Latvian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="285"/>
+        <source>Lithuanian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="286"/>
+        <source>Macedonian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="287"/>
+        <source>Malay (Jawi, Arabic Keyboard)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="288"/>
+        <source>Maltese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="289"/>
+        <source>Maori</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="290"/>
+        <source>Moldavian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="291"/>
+        <source>Mongolian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="292"/>
+        <source>Montenegrin</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="293"/>
+        <source>Nepali</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="294"/>
+        <source>Norwegian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="295"/>
+        <source>Persian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="296"/>
+        <source>Polish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="297"/>
+        <source>Portuguese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="298"/>
+        <source>Portuguese (Brazil)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="299"/>
+        <source>Romanian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="300"/>
+        <source>Russian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="301"/>
+        <source>Serbian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="302"/>
+        <source>Sinhala (phonetic)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="303"/>
+        <source>Slovak</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="304"/>
+        <source>Slovenian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="305"/>
+        <source>Spanish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="306"/>
+        <source>Spanish (Latin American)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="307"/>
+        <source>Swahili (Kenya)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="308"/>
+        <source>Swahili (Tanzania)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="309"/>
+        <source>Swedish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="310"/>
+        <source>Taiwanese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="311"/>
+        <source>Tajik</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="312"/>
+        <source>Thai</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="313"/>
+        <source>Tswana</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="314"/>
+        <source>Turkish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="315"/>
+        <source>Turkmen</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="316"/>
+        <source>Ukrainian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="317"/>
+        <source>Urdu (Pakistan)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="318"/>
+        <source>Uzbek</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="319"/>
+        <source>Vietnamese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="320"/>
+        <source>Wolof</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="331"/>
+        <source>Akan</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="332"/>
+        <source>Albanian (Plisi)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="333"/>
+        <source>Albanian (Veqilharxhi)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="334"/>
+        <source>Arabic (AZERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="335"/>
+        <source>Arabic (AZERTY, Eastern Arabic numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="336"/>
+        <source>Arabic (Algeria)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="337"/>
+        <source>Arabic (Buckwalter)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="338"/>
+        <source>Arabic (Eastern Arabic numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="339"/>
+        <source>Arabic (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="340"/>
+        <source>Arabic (OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="341"/>
+        <source>Arabic (Pakistan)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="342"/>
+        <source>Arabic (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="343"/>
+        <source>Arabic (QWERTY, Eastern Arabic numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="344"/>
+        <source>Armenian (alt. eastern)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="345"/>
+        <source>Armenian (alt. phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="346"/>
+        <source>Armenian (eastern)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="347"/>
+        <source>Armenian (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="348"/>
+        <source>Armenian (western)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="349"/>
+        <source>Asturian (Spain, with bottom-dot H and L)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="350"/>
+        <source>Avatime</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="351"/>
+        <source>Azerbaijani (Cyrillic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="352"/>
+        <source>Bangla (India)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="353"/>
+        <source>Bangla (India, Baishakhi Inscript)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="354"/>
+        <source>Bangla (India, Baishakhi)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="355"/>
+        <source>Bangla (India, Bornona)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="356"/>
+        <source>Bangla (India, Gitanjali)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="357"/>
+        <source>Bangla (India, Probhat)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="358"/>
+        <source>Bangla (Probhat)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="359"/>
+        <source>Bashkirian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="360"/>
+        <source>Belarusian (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="361"/>
+        <source>Belarusian (intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="362"/>
+        <source>Belarusian (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="363"/>
+        <source>Belgian (ISO, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="364"/>
+        <source>Belgian (Latin-9 only, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="365"/>
+        <source>Belgian (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="366"/>
+        <source>Belgian (Sun dead keys, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="367"/>
+        <source>Belgian (Wang 724 AZERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="368"/>
+        <source>Belgian (alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="369"/>
+        <source>Belgian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="370"/>
+        <source>Berber (Morocco, Tifinagh alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="371"/>
+        <source>Berber (Morocco, Tifinagh extended phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="372"/>
+        <source>Berber (Morocco, Tifinagh extended)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="373"/>
+        <source>Berber (Morocco, Tifinagh phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="374"/>
+        <source>Berber (Morocco, Tifinagh phonetic, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="375"/>
+        <source>Berber (Morocco, Tifinagh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="376"/>
+        <source>Bosnian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="377"/>
+        <source>Bosnian (US, with Bosnian digraphs)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="378"/>
+        <source>Bosnian (with Bosnian digraphs)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="379"/>
+        <source>Bosnian (with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="380"/>
+        <source>Braille (left-handed inverted thumb)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="381"/>
+        <source>Braille (left-handed)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="382"/>
+        <source>Braille (right-handed inverted thumb)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="383"/>
+        <source>Braille (right-handed)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="384"/>
+        <source>Bulgarian (enhanced)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="385"/>
+        <source>Bulgarian (new phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="386"/>
+        <source>Bulgarian (traditional phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="387"/>
+        <source>Burmese Zawgyi</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="388"/>
+        <source>Cameroon (AZERTY, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="389"/>
+        <source>Cameroon (Dvorak, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="390"/>
+        <source>Cameroon Multilingual (QWERTY, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="391"/>
+        <source>Canadian (intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="392"/>
+        <source>Canadian (intl., 1st part)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="393"/>
+        <source>Canadian (intl., 2nd part)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="394"/>
+        <source>Catalan (Spain, with middle-dot L)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="395"/>
+        <source>Cherokee</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="396"/>
+        <source>Chuvash</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="397"/>
+        <source>Chuvash (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="398"/>
+        <source>CloGaelach</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="399"/>
+        <source>Crimean Tatar (Turkish Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="400"/>
+        <source>Crimean Tatar (Turkish F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="401"/>
+        <source>Crimean Tatar (Turkish Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="402"/>
+        <source>Croatian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="403"/>
+        <source>Croatian (US, with Croatian digraphs)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="404"/>
+        <source>Croatian (with Croatian digraphs)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="405"/>
+        <source>Croatian (with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="406"/>
+        <source>Czech (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="407"/>
+        <source>Czech (QWERTY, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="408"/>
+        <source>Czech (QWERTY, extended backslash)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="409"/>
+        <source>Czech (UCW, only accented letters)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="410"/>
+        <source>Czech (US, Dvorak, UCW support)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="411"/>
+        <source>Czech (with &amp;lt;|&amp;gt; key)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="412"/>
+        <source>Danish (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="413"/>
+        <source>Danish (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="414"/>
+        <source>Danish (Macintosh, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="415"/>
+        <source>Danish (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="416"/>
+        <source>Danish (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="417"/>
+        <source>Dutch (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="418"/>
+        <source>Dutch (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="419"/>
+        <source>Dutch (standard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="420"/>
+        <source>English (Canada)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="421"/>
+        <source>English (Colemak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="422"/>
+        <source>English (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="423"/>
+        <source>English (Dvorak, alt. intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="424"/>
+        <source>English (Dvorak, intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="425"/>
+        <source>English (Dvorak, left-handed)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="426"/>
+        <source>English (Dvorak, right-handed)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="427"/>
+        <source>English (Ghana, GILLBT)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="428"/>
+        <source>English (Ghana, multilingual)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="429"/>
+        <source>English (India, with rupee)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="430"/>
+        <source>English (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="431"/>
+        <source>English (Mali, US, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="432"/>
+        <source>English (Mali, US, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="433"/>
+        <source>English (Norman)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="434"/>
+        <source>English (UK, Colemak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="435"/>
+        <source>English (UK, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="436"/>
+        <source>English (UK, Dvorak, with UK punctuation)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="437"/>
+        <source>English (UK, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="438"/>
+        <source>English (UK, Macintosh, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="439"/>
+        <source>English (UK, extended, Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="440"/>
+        <source>English (UK, intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="441"/>
+        <source>English (US, Symbolic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="442"/>
+        <source>English (US, alt. intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="443"/>
+        <source>English (US, euro on 5)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="444"/>
+        <source>English (US, intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="445"/>
+        <source>English (Workman)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="446"/>
+        <source>English (Workman, intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="447"/>
+        <source>English (classic Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="448"/>
+        <source>English (intl., with AltGr dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="449"/>
+        <source>English (programmer Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="450"/>
+        <source>English (the divide/multiply toggle the layout)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="451"/>
+        <source>Esperanto (Brazil, Nativo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="452"/>
+        <source>Esperanto (Portugal, Nativo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="453"/>
+        <source>Esperanto (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="454"/>
+        <source>Estonian (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="455"/>
+        <source>Estonian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="456"/>
+        <source>Estonian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="457"/>
+        <source>Ewe</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="458"/>
+        <source>Faroese (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="459"/>
+        <source>Filipino (Capewell-Dvorak, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="460"/>
+        <source>Filipino (Capewell-Dvorak, Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="461"/>
+        <source>Filipino (Capewell-QWERF 2006, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="462"/>
+        <source>Filipino (Capewell-QWERF 2006, Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="463"/>
+        <source>Filipino (Colemak, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="464"/>
+        <source>Filipino (Colemak, Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="465"/>
+        <source>Filipino (Dvorak, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="466"/>
+        <source>Filipino (Dvorak, Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="467"/>
+        <source>Filipino (QWERTY, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="468"/>
+        <source>Finnish (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="469"/>
+        <source>Finnish (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="470"/>
+        <source>Finnish (classic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="471"/>
+        <source>Finnish (classic, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="472"/>
+        <source>French (AZERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="473"/>
+        <source>French (AZERTY, AFNOR)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="474"/>
+        <source>French (BEPO)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="475"/>
+        <source>French (BEPO, AFNOR)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="476"/>
+        <source>French (BEPO, Latin-9 only)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="477"/>
+        <source>French (Breton)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="478"/>
+        <source>French (Cameroon)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="479"/>
+        <source>French (Canada, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="480"/>
+        <source>French (Canada, legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="481"/>
+        <source>French (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="482"/>
+        <source>French (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="483"/>
+        <source>French (Mali, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="484"/>
+        <source>French (Morocco)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="485"/>
+        <source>French (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="486"/>
+        <source>French (Switzerland)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="487"/>
+        <source>French (Switzerland, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="488"/>
+        <source>French (Switzerland, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="489"/>
+        <source>French (Switzerland, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="490"/>
+        <source>French (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="491"/>
+        <source>French (alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="492"/>
+        <source>French (alt., Latin-9 only)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="493"/>
+        <source>French (alt., Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="494"/>
+        <source>French (alt., no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="495"/>
+        <source>French (legacy, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="496"/>
+        <source>French (legacy, alt., Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="497"/>
+        <source>French (legacy, alt., no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="498"/>
+        <source>French (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="499"/>
+        <source>Friulian (Italy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="500"/>
+        <source>Fula</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="501"/>
+        <source>Ga</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="502"/>
+        <source>Georgian (France, AZERTY Tskapo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="503"/>
+        <source>Georgian (Italy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="504"/>
+        <source>Georgian (MESS)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="505"/>
+        <source>Georgian (ergonomic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="506"/>
+        <source>German (Austria, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="507"/>
+        <source>German (Austria, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="508"/>
+        <source>German (Austria, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="509"/>
+        <source>German (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="510"/>
+        <source>German (E1)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="511"/>
+        <source>German (E2)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="512"/>
+        <source>German (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="513"/>
+        <source>German (Macintosh, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="514"/>
+        <source>German (Neo 2)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="515"/>
+        <source>German (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="516"/>
+        <source>German (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="517"/>
+        <source>German (Switzerland, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="518"/>
+        <source>German (Switzerland, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="519"/>
+        <source>German (Switzerland, legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="520"/>
+        <source>German (Switzerland, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="521"/>
+        <source>German (T3)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="522"/>
+        <source>German (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="523"/>
+        <source>German (dead acute)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="524"/>
+        <source>German (dead grave acute)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="525"/>
+        <source>German (dead tilde)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="526"/>
+        <source>German (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="527"/>
+        <source>Greek (extended)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="528"/>
+        <source>Greek (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="529"/>
+        <source>Greek (polytonic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="530"/>
+        <source>Greek (simple)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="531"/>
+        <source>Gujarati</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="532"/>
+        <source>Hanyu Pinyin (with AltGr dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="533"/>
+        <source>Hausa (Ghana)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="534"/>
+        <source>Hausa (Nigeria)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="535"/>
+        <source>Hawaiian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="536"/>
+        <source>Hebrew (Biblical, Tiro)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="537"/>
+        <source>Hebrew (lyx)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="538"/>
+        <source>Hebrew (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="539"/>
+        <source>Hindi (Bolnagri)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="540"/>
+        <source>Hindi (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="541"/>
+        <source>Hindi (Wx)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="542"/>
+        <source>Hungarian (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="543"/>
+        <source>Hungarian (QWERTY, 101-key, comma, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="544"/>
+        <source>Hungarian (QWERTY, 101-key, comma, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="545"/>
+        <source>Hungarian (QWERTY, 101-key, dot, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="546"/>
+        <source>Hungarian (QWERTY, 101-key, dot, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="547"/>
+        <source>Hungarian (QWERTY, 102-key, comma, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="548"/>
+        <source>Hungarian (QWERTY, 102-key, comma, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="549"/>
+        <source>Hungarian (QWERTY, 102-key, dot, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="550"/>
+        <source>Hungarian (QWERTY, 102-key, dot, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="551"/>
+        <source>Hungarian (QWERTZ, 101-key, comma, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="552"/>
+        <source>Hungarian (QWERTZ, 101-key, comma, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="553"/>
+        <source>Hungarian (QWERTZ, 101-key, dot, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="554"/>
+        <source>Hungarian (QWERTZ, 101-key, dot, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="555"/>
+        <source>Hungarian (QWERTZ, 102-key, comma, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="556"/>
+        <source>Hungarian (QWERTZ, 102-key, comma, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="557"/>
+        <source>Hungarian (QWERTZ, 102-key, dot, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="558"/>
+        <source>Hungarian (QWERTZ, 102-key, dot, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="559"/>
+        <source>Hungarian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="560"/>
+        <source>Hungarian (standard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="561"/>
+        <source>Icelandic (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="562"/>
+        <source>Icelandic (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="563"/>
+        <source>Icelandic (Macintosh, legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="564"/>
+        <source>Icelandic (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="565"/>
+        <source>Icelandic (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="566"/>
+        <source>Igbo</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="567"/>
+        <source>Indic (phonetic, IPA)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="568"/>
+        <source>Indonesian (Arab Melayu, extended phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="569"/>
+        <source>Inuktitut</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="570"/>
+        <source>Irish (UnicodeExpert)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="571"/>
+        <source>Italian (IBM 142)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="572"/>
+        <source>Italian (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="573"/>
+        <source>Italian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="574"/>
+        <source>Italian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="575"/>
+        <source>Italian (intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="576"/>
+        <source>Italian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="577"/>
+        <source>Japanese (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="578"/>
+        <source>Japanese (Kana 86)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="579"/>
+        <source>Japanese (Kana)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="580"/>
+        <source>Japanese (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="581"/>
+        <source>Japanese (OADG 109A)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="582"/>
+        <source>Kabylian (Algeria, Tifinagh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="583"/>
+        <source>Kabylian (azerty layout, with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="584"/>
+        <source>Kabylian (qwerty-gb layout, with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="585"/>
+        <source>Kabylian (qwerty-us layout, with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="586"/>
+        <source>Kalmyk</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="587"/>
+        <source>Kannada</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="588"/>
+        <source>Kannada (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="589"/>
+        <source>Kashubian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="590"/>
+        <source>Kazakh (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="591"/>
+        <source>Kazakh (extended)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="592"/>
+        <source>Kazakh (with Russian)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="593"/>
+        <source>Kikuyu</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="594"/>
+        <source>Komi</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="595"/>
+        <source>Korean (101/104-key compatible)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="596"/>
+        <source>Kurdish (Iran, Arabic-Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="597"/>
+        <source>Kurdish (Iran, F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="598"/>
+        <source>Kurdish (Iran, Latin Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="599"/>
+        <source>Kurdish (Iran, Latin Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="600"/>
+        <source>Kurdish (Iraq, Arabic-Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="601"/>
+        <source>Kurdish (Iraq, F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="602"/>
+        <source>Kurdish (Iraq, Latin Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="603"/>
+        <source>Kurdish (Iraq, Latin Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="604"/>
+        <source>Kurdish (Syria, F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="605"/>
+        <source>Kurdish (Syria, Latin Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="606"/>
+        <source>Kurdish (Syria, Latin Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="607"/>
+        <source>Kurdish (Turkey, F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="608"/>
+        <source>Kurdish (Turkey, Latin Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="609"/>
+        <source>Kurdish (Turkey, Latin Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="610"/>
+        <source>Kyrgyz (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="611"/>
+        <source>Lao (STEA)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="612"/>
+        <source>Latvian (F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="613"/>
+        <source>Latvian (adapted)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="614"/>
+        <source>Latvian (apostrophe)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="615"/>
+        <source>Latvian (ergonomic, ŪGJRMV)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="616"/>
+        <source>Latvian (modern)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="617"/>
+        <source>Latvian (tilde)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="618"/>
+        <source>Lithuanian (IBM LST 1205-92)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="619"/>
+        <source>Lithuanian (LEKP)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="620"/>
+        <source>Lithuanian (LEKPa)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="621"/>
+        <source>Lithuanian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="622"/>
+        <source>Lithuanian (standard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="623"/>
+        <source>Lower Sorbian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="624"/>
+        <source>Lower Sorbian (QWERTZ)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="625"/>
+        <source>Macedonian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="626"/>
+        <source>Malay (Jawi, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="627"/>
+        <source>Malayalam</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="628"/>
+        <source>Malayalam (Lalitha)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="629"/>
+        <source>Malayalam (enhanced Inscript, with rupee)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="630"/>
+        <source>Maltese (UK, with AltGr overrides)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="631"/>
+        <source>Maltese (US layout with AltGr overrides)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="632"/>
+        <source>Maltese (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="633"/>
+        <source>Manipuri (Eeyek)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="634"/>
+        <source>Marathi (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="635"/>
+        <source>Marathi (enhanced Inscript)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="636"/>
+        <source>Mari</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="637"/>
+        <source>Mmuock</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="638"/>
+        <source>Moldavian (Gagauz)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="639"/>
+        <source>Mongolian (Bichig)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="640"/>
+        <source>Mongolian (Galik)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="641"/>
+        <source>Mongolian (Manchu Galik)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="642"/>
+        <source>Mongolian (Manchu)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="643"/>
+        <source>Mongolian (Todo Galik)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="644"/>
+        <source>Mongolian (Todo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="645"/>
+        <source>Mongolian (Xibe)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="646"/>
+        <source>Montenegrin (Cyrillic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="647"/>
+        <source>Montenegrin (Cyrillic, ZE and ZHE swapped)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="648"/>
+        <source>Montenegrin (Cyrillic, with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="649"/>
+        <source>Montenegrin (Latin, QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="650"/>
+        <source>Montenegrin (Latin, Unicode)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="651"/>
+        <source>Montenegrin (Latin, Unicode, QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="652"/>
+        <source>Montenegrin (Latin, with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="653"/>
+        <source>Northern Saami (Finland)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="654"/>
+        <source>Northern Saami (Norway)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="655"/>
+        <source>Northern Saami (Norway, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="656"/>
+        <source>Northern Saami (Sweden)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="657"/>
+        <source>Norwegian (Colemak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="658"/>
+        <source>Norwegian (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="659"/>
+        <source>Norwegian (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="660"/>
+        <source>Norwegian (Macintosh, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="661"/>
+        <source>Norwegian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="662"/>
+        <source>Norwegian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="663"/>
+        <source>Occitan</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="664"/>
+        <source>Ogham</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="665"/>
+        <source>Ogham (IS434)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="666"/>
+        <source>Ol Chiki</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="667"/>
+        <source>Oriya</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="668"/>
+        <source>Ossetian (Georgia)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="669"/>
+        <source>Ossetian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="670"/>
+        <source>Ossetian (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="671"/>
+        <source>Pannonian Rusyn</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="672"/>
+        <source>Pashto</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="673"/>
+        <source>Pashto (Afghanistan, OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="674"/>
+        <source>Persian (Afghanistan, Dari OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="675"/>
+        <source>Persian (with Persian keypad)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="676"/>
+        <source>Polish (British keyboard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="677"/>
+        <source>Polish (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="678"/>
+        <source>Polish (Dvorak, with Polish quotes on key 1)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="679"/>
+        <source>Polish (Dvorak, with Polish quotes on quotemark key)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="680"/>
+        <source>Polish (QWERTZ)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="681"/>
+        <source>Polish (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="682"/>
+        <source>Polish (programmer Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="683"/>
+        <source>Portuguese (Brazil, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="684"/>
+        <source>Portuguese (Brazil, IBM/Lenovo ThinkPad)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="685"/>
+        <source>Portuguese (Brazil, Nativo for US keyboards)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="686"/>
+        <source>Portuguese (Brazil, Nativo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="687"/>
+        <source>Portuguese (Brazil, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="688"/>
+        <source>Portuguese (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="689"/>
+        <source>Portuguese (Macintosh, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="690"/>
+        <source>Portuguese (Macintosh, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="691"/>
+        <source>Portuguese (Nativo for US keyboards)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="692"/>
+        <source>Portuguese (Nativo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="693"/>
+        <source>Portuguese (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="694"/>
+        <source>Portuguese (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="695"/>
+        <source>Punjabi (Gurmukhi Jhelum)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="696"/>
+        <source>Punjabi (Gurmukhi)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="697"/>
+        <source>Romanian (Germany)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="698"/>
+        <source>Romanian (Germany, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="699"/>
+        <source>Romanian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="700"/>
+        <source>Romanian (cedilla)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="701"/>
+        <source>Romanian (standard cedilla)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="702"/>
+        <source>Romanian (standard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="703"/>
+        <source>Russian (Belarus)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="704"/>
+        <source>Russian (Czech, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="705"/>
+        <source>Russian (DOS)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="706"/>
+        <source>Russian (Georgia)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="707"/>
+        <source>Russian (Germany, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="708"/>
+        <source>Russian (Kazakhstan, with Kazakh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="709"/>
+        <source>Russian (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="710"/>
+        <source>Russian (Poland, phonetic Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="711"/>
+        <source>Russian (Sweden, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="712"/>
+        <source>Russian (Sweden, phonetic, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="713"/>
+        <source>Russian (US, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="714"/>
+        <source>Russian (Ukraine, standard RSTU)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="715"/>
+        <source>Russian (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="716"/>
+        <source>Russian (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="717"/>
+        <source>Russian (phonetic, AZERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="718"/>
+        <source>Russian (phonetic, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="719"/>
+        <source>Russian (phonetic, French)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="720"/>
+        <source>Russian (phonetic, Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="721"/>
+        <source>Russian (phonetic, YAZHERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="722"/>
+        <source>Russian (typewriter)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="723"/>
+        <source>Russian (typewriter, legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="724"/>
+        <source>Saisiyat (Taiwan)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="725"/>
+        <source>Samogitian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="726"/>
+        <source>Sanskrit (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="727"/>
+        <source>Serbian (Cyrillic, ZE and ZHE swapped)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="728"/>
+        <source>Serbian (Cyrillic, with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="729"/>
+        <source>Serbian (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="730"/>
+        <source>Serbian (Latin, QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="731"/>
+        <source>Serbian (Latin, Unicode)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="732"/>
+        <source>Serbian (Latin, Unicode, QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="733"/>
+        <source>Serbian (Latin, with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="734"/>
+        <source>Serbian (Russia)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="735"/>
+        <source>Serbo-Croatian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="736"/>
+        <source>Sicilian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="737"/>
+        <source>Silesian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="738"/>
+        <source>Sindhi</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="739"/>
+        <source>Sinhala (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="740"/>
+        <source>Slovak (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="741"/>
+        <source>Slovak (QWERTY, extended backslash)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="742"/>
+        <source>Slovak (extended backslash)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="743"/>
+        <source>Slovenian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="744"/>
+        <source>Slovenian (with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="745"/>
+        <source>Spanish (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="746"/>
+        <source>Spanish (Latin American, Colemak for gaming)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="747"/>
+        <source>Spanish (Latin American, Colemak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="748"/>
+        <source>Spanish (Latin American, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="749"/>
+        <source>Spanish (Latin American, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="750"/>
+        <source>Spanish (Latin American, dead tilde)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="751"/>
+        <source>Spanish (Latin American, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="752"/>
+        <source>Spanish (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="753"/>
+        <source>Spanish (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="754"/>
+        <source>Spanish (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="755"/>
+        <source>Spanish (dead tilde)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="756"/>
+        <source>Spanish (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="757"/>
+        <source>Swedish (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="758"/>
+        <source>Swedish (Dvorak, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="759"/>
+        <source>Swedish (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="760"/>
+        <source>Swedish (Svdvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="761"/>
+        <source>Swedish (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="762"/>
+        <source>Swedish (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="763"/>
+        <source>Swedish Sign Language</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="764"/>
+        <source>Syriac</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="765"/>
+        <source>Syriac (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="766"/>
+        <source>Taiwanese (indigenous)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="767"/>
+        <source>Tajik (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="768"/>
+        <source>Tamil (Inscript)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="769"/>
+        <source>Tamil (Sri Lanka, TamilNet &apos;99)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="770"/>
+        <source>Tamil (Sri Lanka, TamilNet &apos;99, TAB encoding)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="771"/>
+        <source>Tamil (TamilNet &apos;99 with Tamil numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="772"/>
+        <source>Tamil (TamilNet &apos;99)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="773"/>
+        <source>Tamil (TamilNet &apos;99, TAB encoding)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="774"/>
+        <source>Tamil (TamilNet &apos;99, TSCII encoding)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="775"/>
+        <source>Tatar</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="776"/>
+        <source>Telugu</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="777"/>
+        <source>Telugu (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="778"/>
+        <source>Telugu (Sarala)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="779"/>
+        <source>Thai (Pattachote)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="780"/>
+        <source>Thai (TIS-820.2538)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="781"/>
+        <source>Tibetan</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="782"/>
+        <source>Tibetan (with ASCII numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="783"/>
+        <source>Turkish (Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="784"/>
+        <source>Turkish (F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="785"/>
+        <source>Turkish (Germany)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="786"/>
+        <source>Turkish (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="787"/>
+        <source>Turkish (intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="788"/>
+        <source>Turkmen (Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="789"/>
+        <source>Udmurt</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="790"/>
+        <source>Ukrainian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="791"/>
+        <source>Ukrainian (homophonic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="792"/>
+        <source>Ukrainian (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="793"/>
+        <source>Ukrainian (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="794"/>
+        <source>Ukrainian (standard RSTU)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="795"/>
+        <source>Ukrainian (typewriter)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="796"/>
+        <source>Urdu (Pakistan, CRULP)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="797"/>
+        <source>Urdu (Pakistan, NLA)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="798"/>
+        <source>Urdu (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="799"/>
+        <source>Urdu (alt. phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="800"/>
+        <source>Urdu (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="801"/>
+        <source>Uyghur</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="802"/>
+        <source>Uzbek (Afghanistan)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="803"/>
+        <source>Uzbek (Afghanistan, OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="804"/>
+        <source>Uzbek (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="805"/>
+        <source>Vietnamese (French)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="806"/>
+        <source>Vietnamese (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="807"/>
+        <source>Yakut</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="808"/>
+        <source>Yoruba</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

From ac6c9fae4aab843d43aa9882610b4542fd0b387a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 13:51:53 +0100
Subject: [PATCH 113/228] [libcalamares] Do not use moved-from object

---
 src/libcalamares/utils/Retranslator.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index a03ae9a3b..668da81dd 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -193,10 +193,9 @@ installTranslator( const QLocale& locale, const QString& brandingTranslationsPre
 {
     loadSingletonTranslator( BrandingLoader( locale, brandingTranslationsPrefix ), s_brandingTranslator );
     loadSingletonTranslator( TZLoader( locale ), s_tztranslator );
+    loadSingletonTranslator( CalamaresLoader( locale ), s_translator );
 
-    CalamaresLoader l( locale );  // because we want the extracted localeName
-    loadSingletonTranslator( std::move( l ), s_translator );
-    s_translatorLocaleName = l.m_localeName;
+    s_translatorLocaleName = CalamaresLoader::mungeLocaleName( locale );
 }
 
 

From f2960366c86ecbb251380d2c3890b812e49b328d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Sat, 20 Jun 2020 00:37:17 -0400
Subject: [PATCH 114/228] [partition] Remove unused addEntry method

- The method addEntry with PartitionEntry appears to be unused since its
  always. Drop it!
---
 src/modules/partition/core/PartitionLayout.cpp | 14 --------------
 src/modules/partition/core/PartitionLayout.h   |  1 -
 2 files changed, 15 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index d42e7b568..2fb4b9966 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -62,20 +62,6 @@ PartitionLayout::PartitionLayout( const PartitionLayout& layout )
 
 PartitionLayout::~PartitionLayout() {}
 
-bool
-PartitionLayout::addEntry( PartitionLayout::PartitionEntry entry )
-{
-    if ( !entry.isValid() )
-    {
-        cError() << "Partition size is invalid or has min size > max size";
-        return false;
-    }
-
-    m_partLayout.append( entry );
-
-    return true;
-}
-
 PartitionLayout::PartitionEntry::PartitionEntry()
     : partAttributes( 0 )
 {
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index 79dff1697..29f2cd609 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -63,7 +63,6 @@ public:
     PartitionLayout( const PartitionLayout& layout );
     ~PartitionLayout();
 
-    bool addEntry( PartitionEntry entry );
     bool addEntry( const QString& mountPoint,
                    const QString& size,
                    const QString& min = QString(),

From eae1e90dcef217b1450fbbc75f43b71343422c7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Mon, 22 Jun 2020 09:59:30 -0400
Subject: [PATCH 115/228] [partition] Remove unused PartitionLayout constructor

- The constructor PartitionLayout with PartitionEntry appears to be
  unused since its always. Drop it!
---
 src/modules/partition/core/PartitionLayout.cpp | 6 ------
 src/modules/partition/core/PartitionLayout.h   | 1 -
 2 files changed, 7 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 2fb4b9966..007808910 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -48,12 +48,6 @@ PartitionLayout::PartitionLayout()
 {
 }
 
-PartitionLayout::PartitionLayout( PartitionLayout::PartitionEntry entry )
-    : PartitionLayout()
-{
-    m_partLayout.append( entry );
-}
-
 PartitionLayout::PartitionLayout( const PartitionLayout& layout )
     : m_defaultFsType( layout.m_defaultFsType )
     , m_partLayout( layout.m_partLayout )
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index 29f2cd609..329a181bb 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -59,7 +59,6 @@ public:
     };
 
     PartitionLayout();
-    PartitionLayout( PartitionEntry entry );
     PartitionLayout( const PartitionLayout& layout );
     ~PartitionLayout();
 

From d6ea30b23e72c20d71bf9356efb43000df0374c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Fri, 19 Jun 2020 23:06:38 -0400
Subject: [PATCH 116/228] [partition] Move initLayout logic to object
 PartitionLayout

- The logic of the method initLayout belongs to the object
  PartitionLayout. Move logic to that object.
- Use a single method initLayout in object PartitionCoreModule.
- Member m_partLayout in object PartitionCoreModule is no longer
  allocated.
---
 .../partition/core/PartitionCoreModule.cpp    | 76 +------------------
 .../partition/core/PartitionCoreModule.h      |  5 +-
 .../partition/core/PartitionLayout.cpp        | 75 ++++++++++++++++++
 src/modules/partition/core/PartitionLayout.h  |  1 +
 .../partition/gui/PartitionViewStep.cpp       |  9 +--
 5 files changed, 81 insertions(+), 85 deletions(-)

diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 3327eb50b..e97aff9fa 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -860,82 +860,10 @@ PartitionCoreModule::setBootLoaderInstallPath( const QString& path )
     m_bootLoaderInstallPath = path;
 }
 
-void
-PartitionCoreModule::initLayout()
-{
-    m_partLayout = new PartitionLayout();
-
-    m_partLayout->addEntry( QString( "/" ), QString( "100%" ) );
-}
-
 void
 PartitionCoreModule::initLayout( const QVariantList& config )
 {
-    bool ok;
-    QString sizeString;
-    QString minSizeString;
-    QString maxSizeString;
-
-    m_partLayout = new PartitionLayout();
-
-    for ( const auto& r : config )
-    {
-        QVariantMap pentry = r.toMap();
-
-        if ( !pentry.contains( "name" ) || !pentry.contains( "mountPoint" ) || !pentry.contains( "filesystem" )
-             || !pentry.contains( "size" ) )
-        {
-            cError() << "Partition layout entry #" << config.indexOf( r )
-                     << "lacks mandatory attributes, switching to default layout.";
-            delete ( m_partLayout );
-            initLayout();
-            break;
-        }
-
-        if ( pentry.contains( "size" ) && CalamaresUtils::getString( pentry, "size" ).isEmpty() )
-        {
-            sizeString.setNum( CalamaresUtils::getInteger( pentry, "size", 0 ) );
-        }
-        else
-        {
-            sizeString = CalamaresUtils::getString( pentry, "size" );
-        }
-
-        if ( pentry.contains( "minSize" ) && CalamaresUtils::getString( pentry, "minSize" ).isEmpty() )
-        {
-            minSizeString.setNum( CalamaresUtils::getInteger( pentry, "minSize", 0 ) );
-        }
-        else
-        {
-            minSizeString = CalamaresUtils::getString( pentry, "minSize" );
-        }
-
-        if ( pentry.contains( "maxSize" ) && CalamaresUtils::getString( pentry, "maxSize" ).isEmpty() )
-        {
-            maxSizeString.setNum( CalamaresUtils::getInteger( pentry, "maxSize", 0 ) );
-        }
-        else
-        {
-            maxSizeString = CalamaresUtils::getString( pentry, "maxSize" );
-        }
-
-        if ( !m_partLayout->addEntry( CalamaresUtils::getString( pentry, "name" ),
-                                      CalamaresUtils::getString( pentry, "uuid" ),
-                                      CalamaresUtils::getString( pentry, "type" ),
-                                      CalamaresUtils::getUnsignedInteger( pentry, "attributes", 0 ),
-                                      CalamaresUtils::getString( pentry, "mountPoint" ),
-                                      CalamaresUtils::getString( pentry, "filesystem" ),
-                                      CalamaresUtils::getSubMap( pentry, "features", ok ),
-                                      sizeString,
-                                      minSizeString,
-                                      maxSizeString ) )
-        {
-            cError() << "Partition layout entry #" << config.indexOf( r ) << "is invalid, switching to default layout.";
-            delete ( m_partLayout );
-            initLayout();
-            break;
-        }
-    }
+    m_partLayout.init( config );
 }
 
 void
@@ -947,7 +875,7 @@ PartitionCoreModule::layoutApply( Device* dev,
                                   const PartitionRole& role )
 {
     bool isEfi = PartUtils::isEfiSystem();
-    QList< Partition* > partList = m_partLayout->execute( dev, firstSector, lastSector, luksPassphrase, parent, role );
+    QList< Partition* > partList = m_partLayout.execute( dev, firstSector, lastSector, luksPassphrase, parent, role );
 
     // Partition::mountPoint() tells us where it is mounted **now**, while
     // PartitionInfo::mountPoint() says where it will be mounted in the target system.
diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
index 1e4179b97..46feb5f94 100644
--- a/src/modules/partition/core/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -156,8 +156,7 @@ public:
     /// @brief Set the path where the bootloader will be installed
     void setBootLoaderInstallPath( const QString& path );
 
-    void initLayout();
-    void initLayout( const QVariantList& config );
+    void initLayout( const QVariantList& config = QVariantList() );
 
     void layoutApply( Device* dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase );
     void layoutApply( Device* dev,
@@ -256,7 +255,7 @@ private:
     bool m_hasRootMountPoint = false;
     bool m_isDirty = false;
     QString m_bootLoaderInstallPath;
-    PartitionLayout* m_partLayout;
+    PartitionLayout m_partLayout;
 
     OsproberEntryList m_osproberLines;
 
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 007808910..7c00a48b2 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -21,6 +21,8 @@
 #include "core/PartitionActions.h"
 #include "core/PartitionInfo.h"
 
+#include "utils/Variant.h"
+
 #include <kpmcore/core/device.h>
 #include <kpmcore/core/partition.h>
 #include <kpmcore/fs/filesystem.h>
@@ -135,6 +137,79 @@ PartitionLayout::addEntry( const QString& label,
     return true;
 }
 
+void
+PartitionLayout::init( const QVariantList& config )
+{
+    bool ok;
+    QString sizeString;
+    QString minSizeString;
+    QString maxSizeString;
+
+    m_partLayout.clear();
+
+    for ( const auto& r : config )
+    {
+        QVariantMap pentry = r.toMap();
+
+        if ( !pentry.contains( "name" ) || !pentry.contains( "mountPoint" ) || !pentry.contains( "filesystem" )
+             || !pentry.contains( "size" ) )
+        {
+            cError() << "Partition layout entry #" << config.indexOf( r )
+                     << "lacks mandatory attributes, switching to default layout.";
+            m_partLayout.clear();
+            break;
+        }
+
+        if ( pentry.contains( "size" ) && CalamaresUtils::getString( pentry, "size" ).isEmpty() )
+        {
+            sizeString.setNum( CalamaresUtils::getInteger( pentry, "size", 0 ) );
+        }
+        else
+        {
+            sizeString = CalamaresUtils::getString( pentry, "size" );
+        }
+
+        if ( pentry.contains( "minSize" ) && CalamaresUtils::getString( pentry, "minSize" ).isEmpty() )
+        {
+            minSizeString.setNum( CalamaresUtils::getInteger( pentry, "minSize", 0 ) );
+        }
+        else
+        {
+            minSizeString = CalamaresUtils::getString( pentry, "minSize" );
+        }
+
+        if ( pentry.contains( "maxSize" ) && CalamaresUtils::getString( pentry, "maxSize" ).isEmpty() )
+        {
+            maxSizeString.setNum( CalamaresUtils::getInteger( pentry, "maxSize", 0 ) );
+        }
+        else
+        {
+            maxSizeString = CalamaresUtils::getString( pentry, "maxSize" );
+        }
+
+        if ( !addEntry( CalamaresUtils::getString( pentry, "name" ),
+                        CalamaresUtils::getString( pentry, "uuid" ),
+                        CalamaresUtils::getString( pentry, "type" ),
+                        CalamaresUtils::getUnsignedInteger( pentry, "attributes", 0 ),
+                        CalamaresUtils::getString( pentry, "mountPoint" ),
+                        CalamaresUtils::getString( pentry, "filesystem" ),
+                        CalamaresUtils::getSubMap( pentry, "features", ok ),
+                        sizeString,
+                        minSizeString,
+                        maxSizeString ) )
+        {
+            cError() << "Partition layout entry #" << config.indexOf( r ) << "is invalid, switching to default layout.";
+            m_partLayout.clear();
+            break;
+        }
+    }
+
+    if ( !m_partLayout.count() )
+    {
+        addEntry( QString( "/" ), QString( "100%" ) );
+    }
+}
+
 QList< Partition* >
 PartitionLayout::execute( Device* dev,
                           qint64 firstSector,
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index 329a181bb..b3c317d50 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -62,6 +62,7 @@ public:
     PartitionLayout( const PartitionLayout& layout );
     ~PartitionLayout();
 
+    void init( const QVariantList& config );
     bool addEntry( const QString& mountPoint,
                    const QString& size,
                    const QString& min = QString(),
diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 63227e3b7..0431e1107 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -596,14 +596,7 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     QFuture< void > future = QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
     m_future->setFuture( future );
 
-    if ( configurationMap.contains( "partitionLayout" ) )
-    {
-        m_core->initLayout( configurationMap.value( "partitionLayout" ).toList() );
-    }
-    else
-    {
-        m_core->initLayout();
-    }
+    m_core->initLayout( configurationMap.value( "partitionLayout" ).toList() );
 }
 
 

From db7cf74034ea265eaba9aa1796ec1276d3ffb4db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Sun, 21 Jun 2020 18:20:26 -0400
Subject: [PATCH 117/228] [partition] Remove the call the method contains

- The variant helper getString() calls contains() already.
---
 src/modules/partition/core/PartitionLayout.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 7c00a48b2..aa08aebb9 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -160,7 +160,7 @@ PartitionLayout::init( const QVariantList& config )
             break;
         }
 
-        if ( pentry.contains( "size" ) && CalamaresUtils::getString( pentry, "size" ).isEmpty() )
+        if ( CalamaresUtils::getString( pentry, "size" ).isEmpty() )
         {
             sizeString.setNum( CalamaresUtils::getInteger( pentry, "size", 0 ) );
         }
@@ -169,7 +169,7 @@ PartitionLayout::init( const QVariantList& config )
             sizeString = CalamaresUtils::getString( pentry, "size" );
         }
 
-        if ( pentry.contains( "minSize" ) && CalamaresUtils::getString( pentry, "minSize" ).isEmpty() )
+        if ( CalamaresUtils::getString( pentry, "minSize" ).isEmpty() )
         {
             minSizeString.setNum( CalamaresUtils::getInteger( pentry, "minSize", 0 ) );
         }
@@ -178,7 +178,7 @@ PartitionLayout::init( const QVariantList& config )
             minSizeString = CalamaresUtils::getString( pentry, "minSize" );
         }
 
-        if ( pentry.contains( "maxSize" ) && CalamaresUtils::getString( pentry, "maxSize" ).isEmpty() )
+        if ( CalamaresUtils::getString( pentry, "maxSize" ).isEmpty() )
         {
             maxSizeString.setNum( CalamaresUtils::getInteger( pentry, "maxSize", 0 ) );
         }

From aec066359a4553294c0e144f97bc85600388f175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Wed, 28 Oct 2020 10:41:48 -0400
Subject: [PATCH 118/228] [libcalamares] Fix coding style

---
 src/libcalamares/partition/PartitionQuery.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/libcalamares/partition/PartitionQuery.cpp b/src/libcalamares/partition/PartitionQuery.cpp
index beba6b9bc..af281f65b 100644
--- a/src/libcalamares/partition/PartitionQuery.cpp
+++ b/src/libcalamares/partition/PartitionQuery.cpp
@@ -67,11 +67,15 @@ findPartitionByPath( const QList< Device* >& devices, const QString& path )
     }
 
     for ( auto device : devices )
+    {
         for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
+        {
             if ( ( *it )->partitionPath() == path.simplified() )
             {
                 return *it;
             }
+        }
+    }
     return nullptr;
 }
 
@@ -81,11 +85,15 @@ findPartitions( const QList< Device* >& devices, std::function< bool( Partition*
 {
     QList< Partition* > results;
     for ( auto device : devices )
+    {
         for ( auto it = PartitionIterator::begin( device ); it != PartitionIterator::end( device ); ++it )
+        {
             if ( criterionFunction( *it ) )
             {
                 results.append( *it );
             }
+        }
+    }
     return results;
 }
 

From 03df5f689152fe31a69d19222f9be0ed18935c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Wed, 28 Oct 2020 11:38:01 -0400
Subject: [PATCH 119/228] [libcalamares] Fix constness of functions

---
 src/libcalamares/partition/PartitionQuery.cpp | 4 ++--
 src/libcalamares/partition/PartitionQuery.h   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libcalamares/partition/PartitionQuery.cpp b/src/libcalamares/partition/PartitionQuery.cpp
index af281f65b..4c9c1549d 100644
--- a/src/libcalamares/partition/PartitionQuery.cpp
+++ b/src/libcalamares/partition/PartitionQuery.cpp
@@ -27,14 +27,14 @@ using ::Device;
 using ::Partition;
 
 bool
-isPartitionFreeSpace( Partition* partition )
+isPartitionFreeSpace( const Partition* partition )
 {
     return partition->roles().has( PartitionRole::Unallocated );
 }
 
 
 bool
-isPartitionNew( Partition* partition )
+isPartitionNew( const Partition* partition )
 {
 #if defined( WITH_KPMCORE4API )
     constexpr auto NewState = Partition::State::New;
diff --git a/src/libcalamares/partition/PartitionQuery.h b/src/libcalamares/partition/PartitionQuery.h
index 817966d35..9ef5f41f6 100644
--- a/src/libcalamares/partition/PartitionQuery.h
+++ b/src/libcalamares/partition/PartitionQuery.h
@@ -34,14 +34,14 @@ using ::Device;
 using ::Partition;
 
 /** @brief Is this a free-space area? */
-bool isPartitionFreeSpace( Partition* );
+bool isPartitionFreeSpace( const Partition* );
 
 /** @brief Is this partition newly-to-be-created?
  *
  * Returns true if the partition is planned to be created by the installer as
  * opposed to already existing on the disk.
  */
-bool isPartitionNew( Partition* );
+bool isPartitionNew( const Partition* );
 
 /**
  * Iterates on all devices and return the first partition which is (already)

From 3f2dd516d3da43525cb733951aef3d78dfba113e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Sun, 21 Jun 2020 18:16:07 -0400
Subject: [PATCH 120/228] [partition] Simplify the retrieval of the size
 attributes

- The variant helper toString() takes a default value since commit
  c9f942ad6 ([libcalamares] Add default value to variant helpers).
- Set the default value to 0 and simplify the retreival of size values
  by calling the helper toString() and removing the temporary variables.
---
 .../partition/core/PartitionLayout.cpp        | 36 ++-----------------
 1 file changed, 3 insertions(+), 33 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index aa08aebb9..b87f8c0ca 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -141,9 +141,6 @@ void
 PartitionLayout::init( const QVariantList& config )
 {
     bool ok;
-    QString sizeString;
-    QString minSizeString;
-    QString maxSizeString;
 
     m_partLayout.clear();
 
@@ -160,33 +157,6 @@ PartitionLayout::init( const QVariantList& config )
             break;
         }
 
-        if ( CalamaresUtils::getString( pentry, "size" ).isEmpty() )
-        {
-            sizeString.setNum( CalamaresUtils::getInteger( pentry, "size", 0 ) );
-        }
-        else
-        {
-            sizeString = CalamaresUtils::getString( pentry, "size" );
-        }
-
-        if ( CalamaresUtils::getString( pentry, "minSize" ).isEmpty() )
-        {
-            minSizeString.setNum( CalamaresUtils::getInteger( pentry, "minSize", 0 ) );
-        }
-        else
-        {
-            minSizeString = CalamaresUtils::getString( pentry, "minSize" );
-        }
-
-        if ( CalamaresUtils::getString( pentry, "maxSize" ).isEmpty() )
-        {
-            maxSizeString.setNum( CalamaresUtils::getInteger( pentry, "maxSize", 0 ) );
-        }
-        else
-        {
-            maxSizeString = CalamaresUtils::getString( pentry, "maxSize" );
-        }
-
         if ( !addEntry( CalamaresUtils::getString( pentry, "name" ),
                         CalamaresUtils::getString( pentry, "uuid" ),
                         CalamaresUtils::getString( pentry, "type" ),
@@ -194,9 +164,9 @@ PartitionLayout::init( const QVariantList& config )
                         CalamaresUtils::getString( pentry, "mountPoint" ),
                         CalamaresUtils::getString( pentry, "filesystem" ),
                         CalamaresUtils::getSubMap( pentry, "features", ok ),
-                        sizeString,
-                        minSizeString,
-                        maxSizeString ) )
+                        CalamaresUtils::getString( pentry, "size", QStringLiteral( "0" ) ),
+                        CalamaresUtils::getString( pentry, "minSize", QStringLiteral( "0" ) ),
+                        CalamaresUtils::getString( pentry, "maxSize", QStringLiteral( "0" ) ) ) )
         {
             cError() << "Partition layout entry #" << config.indexOf( r ) << "is invalid, switching to default layout.";
             m_partLayout.clear();

From 81bec68b3daa1f4758130973e1912dd1784c63ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Sun, 21 Jun 2020 18:02:04 -0400
Subject: [PATCH 121/228] [partition] Introduce new constructors for
 PartitionEntry

- Introduces new constructors for PartitionEntry: copy constructory and
  constructor with all attributes.
- Use the new constructor in method addEntry().
---
 .../partition/core/PartitionLayout.cpp        | 116 ++++++++----------
 src/modules/partition/core/PartitionLayout.h  |  35 +++---
 src/modules/partition/partition.conf          |  14 ++-
 .../partition/tests/CreateLayoutsTests.cpp    |  10 +-
 4 files changed, 88 insertions(+), 87 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index b87f8c0ca..397d64c85 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -63,74 +63,60 @@ PartitionLayout::PartitionEntry::PartitionEntry()
 {
 }
 
-PartitionLayout::PartitionEntry::PartitionEntry( const QString& size, const QString& min, const QString& max )
+PartitionLayout::PartitionEntry::PartitionEntry( const QString& mountPoint, const QString& size, const QString& minSize, const QString& maxSize )
     : partAttributes( 0 )
+    , partMountPoint( mountPoint )
     , partSize( size )
-    , partMinSize( min )
-    , partMaxSize( max )
+    , partMinSize( minSize )
+    , partMaxSize( maxSize )
 {
 }
 
-bool
-PartitionLayout::addEntry( const QString& mountPoint, const QString& size, const QString& min, const QString& max )
+PartitionLayout::PartitionEntry::PartitionEntry( const QString& label,
+                                                 const QString& uuid,
+                                                 const QString& type,
+                                                 quint64 attributes,
+                                                 const QString& mountPoint,
+                                                 const QString& fs,
+                                                 const QVariantMap& features,
+                                                 const QString& size,
+                                                 const QString& minSize,
+                                                 const QString& maxSize )
+    : partLabel( label )
+    , partUUID( uuid )
+    , partType( type )
+    , partAttributes( attributes )
+    , partMountPoint( mountPoint )
+    , partFeatures( features )
+    , partSize( size )
+    , partMinSize( minSize )
+    , partMaxSize( maxSize )
 {
-    PartitionLayout::PartitionEntry entry( size, min, max );
-
-    if ( !entry.isValid() )
-    {
-        cError() << "Partition size" << size << "is invalid or" << min << ">" << max;
-        return false;
-    }
-    if ( mountPoint.isEmpty() || !mountPoint.startsWith( QString( "/" ) ) )
-    {
-        cError() << "Partition mount point" << mountPoint << "is invalid";
-        return false;
-    }
-
-    entry.partMountPoint = mountPoint;
-    entry.partFileSystem = m_defaultFsType;
-
-    m_partLayout.append( entry );
-
-    return true;
+    PartUtils::findFS( fs, &partFileSystem );
 }
 
-bool
-PartitionLayout::addEntry( const QString& label,
-                           const QString& uuid,
-                           const QString& type,
-                           quint64 attributes,
-                           const QString& mountPoint,
-                           const QString& fs,
-                           const QVariantMap& features,
-                           const QString& size,
-                           const QString& min,
-                           const QString& max )
+PartitionLayout::PartitionEntry::PartitionEntry( const PartitionEntry& e )
+    : partLabel( e.partLabel )
+    , partUUID( e.partUUID )
+    , partType( e.partType )
+    , partAttributes( e.partAttributes )
+    , partMountPoint( e.partMountPoint )
+    , partFileSystem( e.partFileSystem )
+    , partFeatures( e.partFeatures )
+    , partSize( e.partSize )
+    , partMinSize( e.partMinSize )
+    , partMaxSize( e.partMaxSize )
 {
-    PartitionLayout::PartitionEntry entry( size, min, max );
+}
 
+
+bool
+PartitionLayout::addEntry( const PartitionEntry& entry )
+{
     if ( !entry.isValid() )
     {
-        cError() << "Partition size" << size << "is invalid or" << min << ">" << max;
         return false;
     }
-    if ( mountPoint.isEmpty() || !mountPoint.startsWith( QString( "/" ) ) )
-    {
-        cError() << "Partition mount point" << mountPoint << "is invalid";
-        return false;
-    }
-
-    entry.partLabel = label;
-    entry.partUUID = uuid;
-    entry.partType = type;
-    entry.partAttributes = attributes;
-    entry.partMountPoint = mountPoint;
-    PartUtils::findFS( fs, &entry.partFileSystem );
-    if ( entry.partFileSystem == FileSystem::Unknown )
-    {
-        entry.partFileSystem = m_defaultFsType;
-    }
-    entry.partFeatures = features;
 
     m_partLayout.append( entry );
 
@@ -157,16 +143,16 @@ PartitionLayout::init( const QVariantList& config )
             break;
         }
 
-        if ( !addEntry( CalamaresUtils::getString( pentry, "name" ),
-                        CalamaresUtils::getString( pentry, "uuid" ),
-                        CalamaresUtils::getString( pentry, "type" ),
-                        CalamaresUtils::getUnsignedInteger( pentry, "attributes", 0 ),
-                        CalamaresUtils::getString( pentry, "mountPoint" ),
-                        CalamaresUtils::getString( pentry, "filesystem" ),
-                        CalamaresUtils::getSubMap( pentry, "features", ok ),
-                        CalamaresUtils::getString( pentry, "size", QStringLiteral( "0" ) ),
-                        CalamaresUtils::getString( pentry, "minSize", QStringLiteral( "0" ) ),
-                        CalamaresUtils::getString( pentry, "maxSize", QStringLiteral( "0" ) ) ) )
+        if ( !addEntry( { CalamaresUtils::getString( pentry, "name" ),
+                          CalamaresUtils::getString( pentry, "uuid" ),
+                          CalamaresUtils::getString( pentry, "type" ),
+                          CalamaresUtils::getUnsignedInteger( pentry, "attributes", 0 ),
+                          CalamaresUtils::getString( pentry, "mountPoint" ),
+                          CalamaresUtils::getString( pentry, "filesystem" ),
+                          CalamaresUtils::getSubMap( pentry, "features", ok ),
+                          CalamaresUtils::getString( pentry, "size", QStringLiteral( "0" ) ),
+                          CalamaresUtils::getString( pentry, "minSize", QStringLiteral( "0" ) ),
+                          CalamaresUtils::getString( pentry, "maxSize", QStringLiteral( "0" ) ) } ) )
         {
             cError() << "Partition layout entry #" << config.indexOf( r ) << "is invalid, switching to default layout.";
             m_partLayout.clear();
@@ -176,7 +162,7 @@ PartitionLayout::init( const QVariantList& config )
 
     if ( !m_partLayout.count() )
     {
-        addEntry( QString( "/" ), QString( "100%" ) );
+        addEntry( { QString( "/" ), QString( "100%" ) } );
     }
 }
 
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index b3c317d50..b27adccec 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -44,8 +44,24 @@ public:
 
         /// @brief All-zeroes PartitionEntry
         PartitionEntry();
-        /// @brief Parse @p size, @p min and @p max to their respective member variables
-        PartitionEntry( const QString& size, const QString& min, const QString& max );
+        /// @brief Parse @p mountPoint, @p size, @p minSize and @p maxSize to their respective member variables
+        PartitionEntry( const QString& mountPoint,
+                        const QString& size,
+                        const QString& minSize = QString(),
+                        const QString& maxSize = QString() );
+        /// @brief All-field PartitionEntry
+        PartitionEntry( const QString& label,
+                        const QString& uuid,
+                        const QString& type,
+                        quint64 attributes,
+                        const QString& mountPoint,
+                        const QString& fs,
+                        const QVariantMap& features,
+                        const QString& size,
+                        const QString& minSize = QString(),
+                        const QString& maxSize = QString() );
+        /// @brief Copy PartitionEntry
+        PartitionEntry( const PartitionEntry& e );
 
         bool isValid() const
         {
@@ -63,20 +79,7 @@ public:
     ~PartitionLayout();
 
     void init( const QVariantList& config );
-    bool addEntry( const QString& mountPoint,
-                   const QString& size,
-                   const QString& min = QString(),
-                   const QString& max = QString() );
-    bool addEntry( const QString& label,
-                   const QString& uuid,
-                   const QString& type,
-                   quint64 attributes,
-                   const QString& mountPoint,
-                   const QString& fs,
-                   const QVariantMap& features,
-                   const QString& size,
-                   const QString& min = QString(),
-                   const QString& max = QString() );
+    bool addEntry( const PartitionEntry& entry );
 
     /**
      * @brief Apply the current partition layout to the selected drive space.
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index bfedddfca..0f8764bfd 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -154,7 +154,19 @@ defaultFileSystemType:  "ext4"
 # If nothing is specified, LUKS is enabled in automated modes.
 #enableLuksAutomatedPartitioning:    true
 
-# To apply a custom partition layout, it has to be defined this way :
+# Partition layout.
+#
+# This optional setting specifies a custom partition layout.
+#
+# If nothing is specified, the default partition layout is a single partition
+# for root that uses 100% of the space and uses the filesystem defined by
+# defaultFileSystemType.
+#
+# Note: the EFI system partition is prepend automatically to the layout if
+# needed; the swap partition is appended to the layout if enabled (small of
+# suspend).
+#
+# Otherwise, the partition layout is defined as follow:
 #
 # partitionLayout:
 #     - name: "rootfs"
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index 12c19db5f..2c173fa79 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -61,7 +61,7 @@ CreateLayoutsTests::testFixedSizePartition()
     PartitionRole role( PartitionRole::Role::Any );
     QList< Partition* > partitions;
 
-    if ( !layout.addEntry( QString( "/" ), QString( "5MiB" ) ) )
+    if ( !layout.addEntry( { QString( "/" ), QString( "5MiB" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
@@ -81,7 +81,7 @@ CreateLayoutsTests::testPercentSizePartition()
     PartitionRole role( PartitionRole::Role::Any );
     QList< Partition* > partitions;
 
-    if ( !layout.addEntry( QString( "/" ), QString( "50%" ) ) )
+    if ( !layout.addEntry( { QString( "/" ), QString( "50%" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
@@ -101,17 +101,17 @@ CreateLayoutsTests::testMixedSizePartition()
     PartitionRole role( PartitionRole::Role::Any );
     QList< Partition* > partitions;
 
-    if ( !layout.addEntry( QString( "/" ), QString( "5MiB" ) ) )
+    if ( !layout.addEntry( { QString( "/" ), QString( "5MiB" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
 
-    if ( !layout.addEntry( QString( "/home" ), QString( "50%" ) ) )
+    if ( !layout.addEntry( { QString( "/home" ), QString( "50%" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create /home partition" ) );
     }
 
-    if ( !layout.addEntry( QString( "/bkup" ), QString( "50%" ) ) )
+    if ( !layout.addEntry( { QString( "/bkup" ), QString( "50%" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create /bkup partition" ) );
     }

From 3016b93c8f7a547a90b52efb6b8fd7d5872cc09e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Mon, 22 Jun 2020 10:36:20 -0400
Subject: [PATCH 122/228] [partition] Simplify the method execute

- Rename the "size" locals using "sectors" in their name. Size may be
  confusing or not enough specific as it can be interpreted a size in
  Byte.
    partSizeMap -> partSectorsMap,
    totalSize -> totalSectors,
    availablesize -> availableSectors,
    size -> sectors,
    minSize -> minSectors
    maxSize -> maxSectors
- Create a the new local currentSector to iterate over the sectors;
  instead of using the parameter firstSector.
- Remove the variable end that does not help much; too many variable
  already. Expand its expression instead.
---
 .../partition/core/PartitionLayout.cpp        | 111 ++++++------------
 1 file changed, 37 insertions(+), 74 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 397d64c85..e5f8479b9 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -176,11 +176,12 @@ PartitionLayout::execute( Device* dev,
 {
     QList< Partition* > partList;
     // Map each partition entry to its requested size (0 when calculated later)
-    QMap< const PartitionLayout::PartitionEntry*, qint64 > partSizeMap;
-    qint64 totalSize = lastSector - firstSector + 1;
-    qint64 availableSize = totalSize;
+    QMap< const PartitionLayout::PartitionEntry*, qint64 > partSectorsMap;
+    const qint64 totalSectors = lastSector - firstSector + 1;
+    qint64 currentSector, availableSectors = totalSectors;
 
-    // Let's check if we have enough space for each partSize
+    // Let's check if we have enough space for each partitions, using the size
+    // propery or the min-size property if unit is in percentage.
     for ( const auto& part : qAsConst( m_partLayout ) )
     {
         if ( !part.partSize.isValid() )
@@ -191,118 +192,80 @@ PartitionLayout::execute( Device* dev,
 
         // Calculate partition size: Rely on "possibly uninitialized use"
         // warnings to ensure that all the cases are covered below.
-        qint64 size;
         // We need to ignore the percent-defined until later
+        qint64 sectors = 0;
         if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent )
         {
-            size = part.partSize.toSectors( totalSize, dev->logicalSize() );
+            sectors = part.partSize.toSectors( totalSectors, dev->logicalSize() );
         }
-        else
+        else if ( part.partMinSize.isValid() )
         {
-            if ( part.partMinSize.isValid() )
-            {
-                size = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
-            }
-            else
-            {
-                size = 0;
-            }
+            sectors = part.partMinSize.toSectors( totalSectors, dev->logicalSize() );
         }
-
-        partSizeMap.insert( &part, size );
-        availableSize -= size;
+        partSectorsMap.insert( &part, sectors );
+        availableSectors -= sectors;
     }
 
-    // Use partMinSize and see if we can do better afterward.
-    if ( availableSize < 0 )
+    // There is not enough space for all partitions, use the min-size property
+    // and see if we can do better afterward.
+    if ( availableSectors < 0 )
     {
-        availableSize = totalSize;
+        availableSectors = totalSectors;
         for ( const auto& part : qAsConst( m_partLayout ) )
         {
-            qint64 size;
-
+            qint64 sectors = partSectorsMap.value( &part );
             if ( part.partMinSize.isValid() )
             {
-                size = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
+                sectors = part.partMinSize.toSectors( totalSectors, dev->logicalSize() );
+                partSectorsMap.insert( &part, sectors );
             }
-            else if ( part.partSize.isValid() )
-            {
-                if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent )
-                {
-                    size = part.partSize.toSectors( totalSize, dev->logicalSize() );
-                }
-                else
-                {
-                    size = 0;
-                }
-            }
-            else
-            {
-                size = 0;
-            }
-
-            partSizeMap.insert( &part, size );
-            availableSize -= size;
+            availableSectors -= sectors;
         }
     }
 
-    // Assign size for percentage-defined partitions
+    // Assign sectors for percentage-defined partitions.
     for ( const auto& part : qAsConst( m_partLayout ) )
     {
         if ( part.partSize.unit() == CalamaresUtils::Partition::SizeUnit::Percent )
         {
-            qint64 size = partSizeMap.value( &part );
-            size = part.partSize.toSectors( availableSize + size, dev->logicalSize() );
+            qint64 sectors = part.partSize.toSectors( availableSectors + partSectorsMap.value( &part ),
+                                                      dev->logicalSize() );
             if ( part.partMinSize.isValid() )
             {
-                qint64 minSize = part.partMinSize.toSectors( totalSize, dev->logicalSize() );
-                if ( minSize > size )
-                {
-                    size = minSize;
-                }
+                sectors = std::max( sectors, part.partMinSize.toSectors( totalSectors, dev->logicalSize() ) );
             }
             if ( part.partMaxSize.isValid() )
             {
-                qint64 maxSize = part.partMaxSize.toSectors( totalSize, dev->logicalSize() );
-                if ( maxSize < size )
-                {
-                    size = maxSize;
-                }
+                sectors = std::min( sectors, part.partMaxSize.toSectors( totalSectors, dev->logicalSize() ) );
             }
-
-            partSizeMap.insert( &part, size );
+            partSectorsMap.insert( &part, sectors );
         }
     }
 
-    availableSize = totalSize;
-
-    // TODO: Refine partition sizes to make sure there is room for every partition
-    // Use a default (200-500M ?) minimum size for partition without minSize
-
+    // Create the partitions.
+    currentSector = firstSector;
+    availableSectors = totalSectors;
     for ( const auto& part : qAsConst( m_partLayout ) )
     {
-        qint64 size, end;
         Partition* currentPartition = nullptr;
 
-        size = partSizeMap.value( &part );
-
-        // Adjust partition size based on available space
-        if ( size > availableSize )
+        // Adjust partition size based on available space.
+        qint64 sectors = partSectorsMap.value( &part );
+        sectors = std::min( sectors, availableSectors );
+        if ( sectors == 0 )
         {
-            size = availableSize;
+            continue;
         }
 
-        end = firstSector + std::max( size - 1, Q_INT64_C( 0 ) );
-
         if ( luksPassphrase.isEmpty() )
         {
             currentPartition = KPMHelpers::createNewPartition(
-                parent, *dev, role, part.partFileSystem, firstSector, end, KPM_PARTITION_FLAG( None ) );
+                parent, *dev, role, part.partFileSystem, currentSector, currentSector + sectors - 1, KPM_PARTITION_FLAG( None ) );
         }
         else
         {
             currentPartition = KPMHelpers::createNewEncryptedPartition(
-                parent, *dev, role, part.partFileSystem, firstSector, end, luksPassphrase, KPM_PARTITION_FLAG( None ) );
+                parent, *dev, role, part.partFileSystem, currentSector, currentSector + sectors - 1, luksPassphrase, KPM_PARTITION_FLAG( None ) );
         }
         PartitionInfo::setFormat( currentPartition, true );
         PartitionInfo::setMountPoint( currentPartition, part.partMountPoint );
@@ -345,8 +308,8 @@ PartitionLayout::execute( Device* dev,
         // Some buggy (legacy) BIOSes test if the bootflag of at least one partition is set.
         // Otherwise they ignore the device in boot-order, so add it here.
         partList.append( currentPartition );
-        firstSector = end + 1;
-        availableSize -= size;
+        currentSector += sectors;
+        availableSectors -= sectors;
     }
 
     return partList;

From 32c1f81fbfdef2d638a800927ea29062b28c6279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Mon, 22 Jun 2020 13:56:57 -0400
Subject: [PATCH 123/228] [partition] Rename iterator in for loop to entry

---
 .../partition/core/PartitionLayout.cpp        | 76 +++++++++----------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index e5f8479b9..2be7d64fd 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -182,11 +182,11 @@ PartitionLayout::execute( Device* dev,
 
     // Let's check if we have enough space for each partitions, using the size
     // propery or the min-size property if unit is in percentage.
-    for ( const auto& part : qAsConst( m_partLayout ) )
+    for ( const auto& entry : qAsConst( m_partLayout ) )
     {
-        if ( !part.partSize.isValid() )
+        if ( !entry.partSize.isValid() )
         {
-            cWarning() << "Partition" << part.partMountPoint << "size is invalid, skipping...";
+            cWarning() << "Partition" << entry.partMountPoint << "size is invalid, skipping...";
             continue;
         }
 
@@ -194,15 +194,15 @@ PartitionLayout::execute( Device* dev,
         // warnings to ensure that all the cases are covered below.
         // We need to ignore the percent-defined until later
         qint64 sectors = 0;
-        if ( part.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent )
+        if ( entry.partSize.unit() != CalamaresUtils::Partition::SizeUnit::Percent )
         {
-            sectors = part.partSize.toSectors( totalSectors, dev->logicalSize() );
+            sectors = entry.partSize.toSectors( totalSectors, dev->logicalSize() );
         }
-        else if ( part.partMinSize.isValid() )
+        else if ( entry.partMinSize.isValid() )
         {
-            sectors = part.partMinSize.toSectors( totalSectors, dev->logicalSize() );
+            sectors = entry.partMinSize.toSectors( totalSectors, dev->logicalSize() );
         }
-        partSectorsMap.insert( &part, sectors );
+        partSectorsMap.insert( &entry, sectors );
         availableSectors -= sectors;
     }
 
@@ -211,46 +211,46 @@ PartitionLayout::execute( Device* dev,
     if ( availableSectors < 0 )
     {
         availableSectors = totalSectors;
-        for ( const auto& part : qAsConst( m_partLayout ) )
+        for ( const auto& entry : qAsConst( m_partLayout ) )
         {
-            qint64 sectors = partSectorsMap.value( &part );
-            if ( part.partMinSize.isValid() )
+            qint64 sectors = partSectorsMap.value( &entry );
+            if ( entry.partMinSize.isValid() )
             {
-                sectors = part.partMinSize.toSectors( totalSectors, dev->logicalSize() );
-                partSectorsMap.insert( &part, sectors );
+                sectors = entry.partMinSize.toSectors( totalSectors, dev->logicalSize() );
+                partSectorsMap.insert( &entry, sectors );
             }
             availableSectors -= sectors;
         }
     }
 
     // Assign sectors for percentage-defined partitions.
-    for ( const auto& part : qAsConst( m_partLayout ) )
+    for ( const auto& entry : qAsConst( m_partLayout ) )
     {
-        if ( part.partSize.unit() == CalamaresUtils::Partition::SizeUnit::Percent )
+        if ( entry.partSize.unit() == CalamaresUtils::Partition::SizeUnit::Percent )
         {
-            qint64 sectors = part.partSize.toSectors( availableSectors + partSectorsMap.value( &part ),
+            qint64 sectors = entry.partSize.toSectors( availableSectors + partSectorsMap.value( &entry ),
                                                       dev->logicalSize() );
-            if ( part.partMinSize.isValid() )
+            if ( entry.partMinSize.isValid() )
             {
-                sectors = std::max( sectors, part.partMinSize.toSectors( totalSectors, dev->logicalSize() ) );
+                sectors = std::max( sectors, entry.partMinSize.toSectors( totalSectors, dev->logicalSize() ) );
             }
-            if ( part.partMaxSize.isValid() )
+            if ( entry.partMaxSize.isValid() )
             {
-                sectors = std::min( sectors, part.partMaxSize.toSectors( totalSectors, dev->logicalSize() ) );
+                sectors = std::min( sectors, entry.partMaxSize.toSectors( totalSectors, dev->logicalSize() ) );
             }
-            partSectorsMap.insert( &part, sectors );
+            partSectorsMap.insert( &entry, sectors );
         }
     }
 
     // Create the partitions.
     currentSector = firstSector;
     availableSectors = totalSectors;
-    for ( const auto& part : qAsConst( m_partLayout ) )
+    for ( const auto& entry : qAsConst( m_partLayout ) )
     {
         Partition* currentPartition = nullptr;
 
         // Adjust partition size based on available space.
-        qint64 sectors = partSectorsMap.value( &part );
+        qint64 sectors = partSectorsMap.value( &entry );
         sectors = std::min( sectors, availableSectors );
         if ( sectors == 0 )
         {
@@ -260,46 +260,46 @@ PartitionLayout::execute( Device* dev,
         if ( luksPassphrase.isEmpty() )
         {
             currentPartition = KPMHelpers::createNewPartition(
-                parent, *dev, role, part.partFileSystem, currentSector, currentSector + sectors - 1, KPM_PARTITION_FLAG( None ) );
+                parent, *dev, role, entry.partFileSystem, currentSector, currentSector + sectors - 1, KPM_PARTITION_FLAG( None ) );
         }
         else
         {
             currentPartition = KPMHelpers::createNewEncryptedPartition(
-                parent, *dev, role, part.partFileSystem, currentSector, currentSector + sectors - 1, luksPassphrase, KPM_PARTITION_FLAG( None ) );
+                parent, *dev, role, entry.partFileSystem, currentSector, currentSector + sectors - 1, luksPassphrase, KPM_PARTITION_FLAG( None ) );
         }
         PartitionInfo::setFormat( currentPartition, true );
-        PartitionInfo::setMountPoint( currentPartition, part.partMountPoint );
-        if ( !part.partLabel.isEmpty() )
+        PartitionInfo::setMountPoint( currentPartition, entry.partMountPoint );
+        if ( !entry.partLabel.isEmpty() )
         {
-            currentPartition->setLabel( part.partLabel );
-            currentPartition->fileSystem().setLabel( part.partLabel );
+            currentPartition->setLabel( entry.partLabel );
+            currentPartition->fileSystem().setLabel( entry.partLabel );
         }
-        if ( !part.partUUID.isEmpty() )
+        if ( !entry.partUUID.isEmpty() )
         {
-            currentPartition->setUUID( part.partUUID );
+            currentPartition->setUUID( entry.partUUID );
         }
-        if ( !part.partType.isEmpty() )
+        if ( !entry.partType.isEmpty() )
         {
 #if defined( WITH_KPMCORE42API )
-            currentPartition->setType( part.partType );
+            currentPartition->setType( entry.partType );
 #else
             cWarning() << "Ignoring type; requires KPMcore >= 4.2.0.";
 #endif
         }
-        if ( part.partAttributes )
+        if ( entry.partAttributes )
         {
 #if defined( WITH_KPMCORE42API )
-            currentPartition->setAttributes( part.partAttributes );
+            currentPartition->setAttributes( entry.partAttributes );
 #else
             cWarning() << "Ignoring attributes; requires KPMcore >= 4.2.0.";
 #endif
         }
-        if ( !part.partFeatures.isEmpty() )
+        if ( !entry.partFeatures.isEmpty() )
         {
 #if defined( WITH_KPMCORE42API )
-            for ( const auto& k : part.partFeatures.keys() )
+            for ( const auto& k : entry.partFeatures.keys() )
             {
-                currentPartition->fileSystem().addFeature( k, part.partFeatures.value( k ) );
+                currentPartition->fileSystem().addFeature( k, entry.partFeatures.value( k ) );
             }
 #else
             cWarning() << "Ignoring features; requires KPMcore >= 4.2.0.";

From 20073358658553aec5e595d9ebec9db03b0326d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Mon, 22 Jun 2020 16:34:06 -0400
Subject: [PATCH 124/228] [partition] Rename the KPMCore Partition local to
 part

---
 .../partition/core/PartitionLayout.cpp        | 25 +++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 2be7d64fd..b02cdfaf4 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -247,8 +247,6 @@ PartitionLayout::execute( Device* dev,
     availableSectors = totalSectors;
     for ( const auto& entry : qAsConst( m_partLayout ) )
     {
-        Partition* currentPartition = nullptr;
-
         // Adjust partition size based on available space.
         qint64 sectors = partSectorsMap.value( &entry );
         sectors = std::min( sectors, availableSectors );
@@ -257,31 +255,32 @@ PartitionLayout::execute( Device* dev,
             continue;
         }
 
+        Partition* part = nullptr;
         if ( luksPassphrase.isEmpty() )
         {
-            currentPartition = KPMHelpers::createNewPartition(
+            part = KPMHelpers::createNewPartition(
                 parent, *dev, role, entry.partFileSystem, currentSector, currentSector + sectors - 1, KPM_PARTITION_FLAG( None ) );
         }
         else
         {
-            currentPartition = KPMHelpers::createNewEncryptedPartition(
+            part = KPMHelpers::createNewEncryptedPartition(
                 parent, *dev, role, entry.partFileSystem, currentSector, currentSector + sectors - 1, luksPassphrase, KPM_PARTITION_FLAG( None ) );
         }
-        PartitionInfo::setFormat( currentPartition, true );
-        PartitionInfo::setMountPoint( currentPartition, entry.partMountPoint );
+        PartitionInfo::setFormat( part, true );
+        PartitionInfo::setMountPoint( part, entry.partMountPoint );
         if ( !entry.partLabel.isEmpty() )
         {
-            currentPartition->setLabel( entry.partLabel );
-            currentPartition->fileSystem().setLabel( entry.partLabel );
+            part->setLabel( entry.partLabel );
+            part->fileSystem().setLabel( entry.partLabel );
         }
         if ( !entry.partUUID.isEmpty() )
         {
-            currentPartition->setUUID( entry.partUUID );
+            part->setUUID( entry.partUUID );
         }
         if ( !entry.partType.isEmpty() )
         {
 #if defined( WITH_KPMCORE42API )
-            currentPartition->setType( entry.partType );
+            part->setType( entry.partType );
 #else
             cWarning() << "Ignoring type; requires KPMcore >= 4.2.0.";
 #endif
@@ -289,7 +288,7 @@ PartitionLayout::execute( Device* dev,
         if ( entry.partAttributes )
         {
 #if defined( WITH_KPMCORE42API )
-            currentPartition->setAttributes( entry.partAttributes );
+            part->setAttributes( entry.partAttributes );
 #else
             cWarning() << "Ignoring attributes; requires KPMcore >= 4.2.0.";
 #endif
@@ -299,7 +298,7 @@ PartitionLayout::execute( Device* dev,
 #if defined( WITH_KPMCORE42API )
             for ( const auto& k : entry.partFeatures.keys() )
             {
-                currentPartition->fileSystem().addFeature( k, entry.partFeatures.value( k ) );
+                part->fileSystem().addFeature( k, entry.partFeatures.value( k ) );
             }
 #else
             cWarning() << "Ignoring features; requires KPMcore >= 4.2.0.";
@@ -307,7 +306,7 @@ PartitionLayout::execute( Device* dev,
         }
         // Some buggy (legacy) BIOSes test if the bootflag of at least one partition is set.
         // Otherwise they ignore the device in boot-order, so add it here.
-        partList.append( currentPartition );
+        partList.append( part );
         currentSector += sectors;
         availableSectors -= sectors;
     }

From cd725fbb4b43aa8c9f7f52353b31c88f04d90c3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Thu, 29 Oct 2020 09:23:28 -0400
Subject: [PATCH 125/228] Fix missing SPDX-FileCopyrightText in header

---
 src/modules/partition/core/PartUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index a514b9c34..084b7f8f5 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -1,7 +1,7 @@
 /* === This file is part of Calamares - <https://calamares.io> ===
  *
  *   SPDX-FileCopyrightText: 2015-2016 Teo Mrnjavac <teo@kde.org>
- *   Copyright 2018-2019 Adriaan de Groot <groot@kde.org>
+ *   SPDX-FileCopyrightText: 2018-2019 Adriaan de Groot <groot@kde.org>
  *   SPDX-FileCopyrightText: 2019 Collabora Ltd <arnaud.ferraris@collabora.com>
  *   SPDX-License-Identifier: GPL-3.0-or-later
  *

From f2bfe2bd6a9c20a115f2780efb1fa5bc8356f01e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Fri, 30 Oct 2020 10:01:29 -0400
Subject: [PATCH 126/228] [partition] Fix coding style

---
 src/modules/partition/core/PartUtils.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 084b7f8f5..07ab5acc1 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -59,7 +59,7 @@ convenienceName( const Partition* const candidate )
 
     QString p;
     QTextStream s( &p );
-    s << static_cast<const void*>(candidate);  // No good name available, use pointer address
+    s << static_cast< const void* >( candidate );  // No good name available, use pointer address
 
     return p;
 }

From f03ae06deb42c593a0fa9ad524305e28d55e0d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Fri, 30 Oct 2020 10:15:30 -0400
Subject: [PATCH 127/228] [partition] Rename execute to createPartitions

---
 src/modules/partition/core/PartitionCoreModule.cpp |  2 +-
 src/modules/partition/core/PartitionLayout.cpp     | 12 ++++++------
 src/modules/partition/core/PartitionLayout.h       | 12 ++++++------
 src/modules/partition/tests/CreateLayoutsTests.cpp |  6 +++---
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index e97aff9fa..706f99017 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -875,7 +875,7 @@ PartitionCoreModule::layoutApply( Device* dev,
                                   const PartitionRole& role )
 {
     bool isEfi = PartUtils::isEfiSystem();
-    QList< Partition* > partList = m_partLayout.execute( dev, firstSector, lastSector, luksPassphrase, parent, role );
+    QList< Partition* > partList = m_partLayout.createPartitions( dev, firstSector, lastSector, luksPassphrase, parent, role );
 
     // Partition::mountPoint() tells us where it is mounted **now**, while
     // PartitionInfo::mountPoint() says where it will be mounted in the target system.
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index b02cdfaf4..15b18da93 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -167,12 +167,12 @@ PartitionLayout::init( const QVariantList& config )
 }
 
 QList< Partition* >
-PartitionLayout::execute( Device* dev,
-                          qint64 firstSector,
-                          qint64 lastSector,
-                          QString luksPassphrase,
-                          PartitionNode* parent,
-                          const PartitionRole& role )
+PartitionLayout::createPartitions( Device* dev,
+                                   qint64 firstSector,
+                                   qint64 lastSector,
+                                   QString luksPassphrase,
+                                   PartitionNode* parent,
+                                   const PartitionRole& role )
 {
     QList< Partition* > partList;
     // Map each partition entry to its requested size (0 when calculated later)
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index b27adccec..9720ab765 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -85,12 +85,12 @@ public:
      * @brief Apply the current partition layout to the selected drive space.
      * @return  A list of Partition objects.
      */
-    QList< Partition* > execute( Device* dev,
-                                 qint64 firstSector,
-                                 qint64 lastSector,
-                                 QString luksPassphrase,
-                                 PartitionNode* parent,
-                                 const PartitionRole& role );
+    QList< Partition* > createPartitions( Device* dev,
+                                          qint64 firstSector,
+                                          qint64 lastSector,
+                                          QString luksPassphrase,
+                                          PartitionNode* parent,
+                                          const PartitionRole& role );
 
 private:
     FileSystem::Type m_defaultFsType;
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index 2c173fa79..6a56eee99 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -66,7 +66,7 @@ CreateLayoutsTests::testFixedSizePartition()
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
 
-    partitions = layout.execute( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
+    partitions = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
 
     QCOMPARE( partitions.count(), 1 );
 
@@ -86,7 +86,7 @@ CreateLayoutsTests::testPercentSizePartition()
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
 
-    partitions = layout.execute( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
+    partitions = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
 
     QCOMPARE( partitions.count(), 1 );
 
@@ -116,7 +116,7 @@ CreateLayoutsTests::testMixedSizePartition()
         QFAIL( qPrintable( "Unable to create /bkup partition" ) );
     }
 
-    partitions = layout.execute( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
+    partitions = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
 
     QCOMPARE( partitions.count(), 3 );
 

From 7659dfdb9d9efa7687cd1604d34fbf44a2fb69d2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 13:58:17 +0100
Subject: [PATCH 128/228] [libcalamares] Expose a translations-loading function

---
 src/libcalamares/utils/Retranslator.cpp |  8 +++++++-
 src/libcalamares/utils/Retranslator.h   | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index 668da81dd..7781ecf51 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -195,7 +195,7 @@ installTranslator( const QLocale& locale, const QString& brandingTranslationsPre
     loadSingletonTranslator( TZLoader( locale ), s_tztranslator );
     loadSingletonTranslator( CalamaresLoader( locale ), s_translator );
 
-    s_translatorLocaleName = CalamaresLoader::mungeLocaleName( locale );
+    s_translatorLocaleName = CalamaresLoader::mungeLocaleName(locale);
 }
 
 
@@ -205,6 +205,12 @@ translatorLocaleName()
     return s_translatorLocaleName;
 }
 
+bool
+loadTranslator( const QLocale& locale, const QString& prefix, QTranslator *translator )
+{
+    return ::tryLoad( translator, prefix, locale.name() );
+}
+
 Retranslator*
 Retranslator::retranslatorFor( QObject* parent )
 {
diff --git a/src/libcalamares/utils/Retranslator.h b/src/libcalamares/utils/Retranslator.h
index 476c0b184..df38fa4d8 100644
--- a/src/libcalamares/utils/Retranslator.h
+++ b/src/libcalamares/utils/Retranslator.h
@@ -21,6 +21,7 @@
 
 class QEvent;
 class QLocale;
+class QTranslator;
 
 namespace CalamaresUtils
 {
@@ -31,8 +32,29 @@ namespace CalamaresUtils
  */
 DLLEXPORT void installTranslator( const QLocale& locale, const QString& brandingTranslationsPrefix );
 
+/** @brief The name of the (locale of the) most recently installed translator
+ *
+ * May return something different from the locale.name() of the
+ * QLocale passed in, because Calamares will munge some names and
+ * may remap translations.
+ */
 DLLEXPORT QString translatorLocaleName();
 
+/** @brief Loads <prefix><locale> translations into the given @p translator
+ *
+ * This function is not intended for general use: it is for those special
+ * cases where modules need their own translator / translations for data
+ * that is locale to the module. Tries to load a .qm from "sensible"
+ * locations, which are the same ones that installTranslator() would use.
+ * Takes local-translations into account.
+ *
+ * Note that @p prefix should end with an underscore '_' -- this function
+ * does not introduce one by itself.
+ *
+ * @returns @c true on success
+ */
+DLLEXPORT bool loadTranslator( const QLocale& locale, const QString& prefix, QTranslator* translator );
+
 /** @brief Set @p allow to true to load translations from current dir.
  *
  * If false, (or never called) the translations are loaded only from

From b72eba81576c925a676971e7246a0a6c99617d6e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 14:47:30 +0100
Subject: [PATCH 129/228] [libcalamares] Extend the Deleter-helper with
 "preserve"

Sometimes you want to keep the thing around after all.
---
 src/libcalamares/utils/RAII.h | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/libcalamares/utils/RAII.h b/src/libcalamares/utils/RAII.h
index d6f8fe94d..1cbead4a2 100644
--- a/src/libcalamares/utils/RAII.h
+++ b/src/libcalamares/utils/RAII.h
@@ -16,20 +16,28 @@
 
 #include <type_traits>
 
-/// @brief Convenience to zero out and deleteLater of any QObject-derived-class
+/** @brief Convenience to zero out and deleteLater of any QObject-derived-class
+ *
+ * If, before destruction, preserve is set to @c true, then
+ * the object is "preserved", and not deleted at all.
+ */
 template < typename T >
 struct cqDeleter
 {
     T*& p;
+    bool preserve = false;
 
     ~cqDeleter()
     {
         static_assert( std::is_base_of< QObject, T >::value, "Not a QObject-class" );
-        if ( p )
+        if ( !preserve )
         {
-            p->deleteLater();
+            if ( p )
+            {
+                p->deleteLater();
+            }
+            p = nullptr;
         }
-        p = nullptr;
     }
 };
 

From 89a180ee5850733f25d18529bf3d65ce00eac91f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 14:38:11 +0100
Subject: [PATCH 130/228] [keyboard] Initial support for translated keyboard
 names

---
 src/modules/keyboard/KeyboardLayoutModel.cpp | 18 ++++++++++++++++++
 src/modules/keyboard/KeyboardLayoutModel.h   |  2 +-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index b8cb892f4..9be9c8ef9 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -11,9 +11,15 @@
 #include "KeyboardLayoutModel.h"
 
 #include "utils/Logger.h"
+#include "utils/RAII.h"
+#include "utils/Retranslator.h"
+
+#include <QTranslator>
 
 #include <algorithm>
 
+static QTranslator* s_kbtranslator = nullptr;
+
 XKBListModel::XKBListModel( QObject* parent )
     : QAbstractListModel( parent )
 {
@@ -41,6 +47,11 @@ XKBListModel::data( const QModelIndex& index, int role ) const
     switch ( role )
     {
     case LabelRole:
+        if ( s_kbtranslator && m_contextname )
+        {
+            auto s = s_kbtranslator->translate( m_contextname, item.label.toUtf8().data() );
+            cDebug() << "Translated" << item.label << "to" << s;
+        }
         return item.label;
     case KeyRole:
         return item.key;
@@ -93,6 +104,8 @@ XKBListModel::setCurrentIndex( int index )
 KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
     : XKBListModel( parent )
 {
+    m_contextname = "kb_models";
+
     // The models map is from human-readable names (!) to xkb identifier
     const auto models = KeyboardGlobal::getKeyboardModels();
     m_list.reserve( models.count() );
@@ -110,6 +123,10 @@ KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
     }
 
     cDebug() << "Loaded" << m_list.count() << "keyboard models";
+
+    CALAMARES_RETRANSLATE( if ( !s_kbtranslator ) { s_kbtranslator = new QTranslator; } cqDeleter<QTranslator> d { s_kbtranslator };
+                           d.preserve
+                           = CalamaresUtils::loadTranslator( QLocale(), QStringLiteral( "kb_" ), s_kbtranslator ); )
 }
 
 
@@ -207,6 +224,7 @@ KeyboardLayoutModel::currentIndex() const
 KeyboardVariantsModel::KeyboardVariantsModel( QObject* parent )
     : XKBListModel( parent )
 {
+    m_contextname = "kb_variants";
 }
 
 void
diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index 60747da55..9c83e41d8 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -21,7 +21,6 @@
  *
  * This model acts like it has a single selection, as well.
  */
-
 class XKBListModel : public QAbstractListModel
 {
     Q_OBJECT
@@ -70,6 +69,7 @@ protected:
     };
     QVector< ModelInfo > m_list;
     int m_currentIndex = -1;
+    const char* m_contextname = nullptr;
 };
 
 

From 71e0081fceb927c4cd57a97410f860bedd8a138e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 30 Oct 2020 12:36:57 +0100
Subject: [PATCH 131/228] [keyboard] SPDX-tagging

---
 src/modules/keyboard/non-ascii-layouts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/keyboard/non-ascii-layouts b/src/modules/keyboard/non-ascii-layouts
index 83935c190..34035c91b 100644
--- a/src/modules/keyboard/non-ascii-layouts
+++ b/src/modules/keyboard/non-ascii-layouts
@@ -1,3 +1,6 @@
+# SPDX-FileCopyrightText: no
+# SPDX-License-Identifier: CC0-1.0
+#
 # Layouts stored here need additional layout (usually us) to provide ASCII support for user
 
 #layout   additional-layout   additional-variant   vconsole-keymap

From 4387b8061e88a635e9d9a885d4ce261d7be6976a Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 31 Oct 2020 20:02:21 +0100
Subject: [PATCH 132/228] [keyboard] Move responsibility for retranslation to
 Config

- only widgets get language change events, so we need to
  hook that up to the ViewSteps and inform the Config
  object so that it can (re)load translations for the
  keyboard data.
---
 src/modules/keyboard/Config.cpp              |  5 +++++
 src/modules/keyboard/Config.h                | 11 +++++++++++
 src/modules/keyboard/KeyboardLayoutModel.cpp |  4 ----
 src/modules/keyboard/KeyboardPage.cpp        |  9 ++++++++-
 src/modules/keyboard/KeyboardPage.h          |  2 ++
 5 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 5d5e80d5f..85bb2e9d6 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -560,3 +560,8 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
         m_writeEtcDefaultKeyboard = true;
     }
 }
+
+void
+Config::retranslate()
+{
+}
diff --git a/src/modules/keyboard/Config.h b/src/modules/keyboard/Config.h
index e35193484..90eeb0e7b 100644
--- a/src/modules/keyboard/Config.h
+++ b/src/modules/keyboard/Config.h
@@ -58,6 +58,17 @@ public:
      */
     KeyboardVariantsModel* keyboardVariants() const;
 
+    /** @brief Call this to change application language
+     *
+     * The models (for keyboard model, layouts and variants) provide
+     * translations of strings in the xkb table, so need to be
+     * notified of language changes as well.
+     *
+     * Only widgets get LanguageChange events, so one of them will
+     * need to call this.
+     */
+    void retranslate();
+
 signals:
     void prettyStatusChanged();
 
diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 9be9c8ef9..f1e6a66c6 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -123,10 +123,6 @@ KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
     }
 
     cDebug() << "Loaded" << m_list.count() << "keyboard models";
-
-    CALAMARES_RETRANSLATE( if ( !s_kbtranslator ) { s_kbtranslator = new QTranslator; } cqDeleter<QTranslator> d { s_kbtranslator };
-                           d.preserve
-                           = CalamaresUtils::loadTranslator( QLocale(), QStringLiteral( "kb_" ), s_kbtranslator ); )
 }
 
 
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 2be897e58..7522056a3 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -95,10 +95,17 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
     connect( config->keyboardVariants(), &KeyboardVariantsModel::currentIndexChanged, [this]( int index ) {
         ui->variantSelector->setCurrentIndex( m_config->keyboardVariants()->index( index ) );
     } );
-    CALAMARES_RETRANSLATE( ui->retranslateUi( this ); )
+    CALAMARES_RETRANSLATE_SLOT( &KeyboardPage::retranslate )
 }
 
 KeyboardPage::~KeyboardPage()
 {
     delete ui;
 }
+
+void
+KeyboardPage::retranslate()
+{
+    ui->retranslateUi( this );
+    m_config->retranslate();
+}
diff --git a/src/modules/keyboard/KeyboardPage.h b/src/modules/keyboard/KeyboardPage.h
index 98925fcad..1c644cc08 100644
--- a/src/modules/keyboard/KeyboardPage.h
+++ b/src/modules/keyboard/KeyboardPage.h
@@ -37,6 +37,8 @@ public:
     explicit KeyboardPage( Config* config, QWidget* parent = nullptr );
     ~KeyboardPage() override;
 
+    void retranslate();
+
 private:
     Ui::Page_Keyboard* ui;
     KeyBoardPreview* m_keyboardPreview;

From dad9587c3ea7ddceddd8b2dc08be8b49fdbb1f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Tue, 27 Oct 2020 07:16:39 -0400
Subject: [PATCH 133/228] [partition] Allow a configurable swap Partition name

This commit adds the new configuration `swapPartitionName` to the file
partition.conf.

This option sets the partition name to the swap partition that is
created. If this option is unset, the partition is left unnamed.
---
 src/modules/partition/core/PartitionActions.cpp | 4 ++++
 src/modules/partition/gui/PartitionViewStep.cpp | 6 ++++++
 src/modules/partition/partition.conf            | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index a78e8ff53..c874145e3 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -203,6 +203,10 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
                                                                      KPM_PARTITION_FLAG( None ) );
         }
         PartitionInfo::setFormat( swapPartition, true );
+        if ( gs->contains( "swapPartitionName" ))
+        {
+            swapPartition->setLabel( gs->value( "swapPartitionName" ).toString() );
+        }
         core->createPartition( dev, swapPartition );
     }
 
diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 0431e1107..13f5e77cc 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -543,6 +543,12 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
         gs->insert( "efiSystemPartitionName", CalamaresUtils::getString( configurationMap, "efiSystemPartitionName" ) );
     }
 
+    // Read and parse key swapPartitionName
+    if ( configurationMap.contains( "swapPartitionName" ) )
+    {
+        gs->insert( "swapPartitionName", CalamaresUtils::getString( configurationMap, "swapPartitionName" ) );
+    }
+
     // OTHER SETTINGS
     //
     gs->insert( "drawNestedPartitions", CalamaresUtils::getBool( configurationMap, "drawNestedPartitions", false ) );
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index 0f8764bfd..95f7d0576 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -48,6 +48,10 @@ userSwapChoices:
     # - reuse     # Re-use existing swap, but don't create any (unsupported right now)
     - file      # To swap file instead of partition
 
+# This optional setting specifies the name of the swap partition.
+# If nothing is specified, the partition name is left unset.
+# swapPartitionName:      swap
+
 # LEGACY SETTINGS (these will generate a warning)
 # ensureSuspendToDisk:    true
 # neverCreateSwap:        false

From 8bfc4dfcd22655888f791286b1bb77b6189f32d1 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 31 Oct 2020 22:53:47 +0100
Subject: [PATCH 134/228] Docs: try to get the table of links right

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7ad26e2c5..981e0c583 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,8 @@
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5389/badge.svg)](https://scan.coverity.com/projects/5389)
 [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE)
 
-| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Freenode (IRC): #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest|) | [Wiki](https://github.com/calamares/calamares/wiki) |
-|:-----------------------------------------:|:----------------------:|:-----------------------:|:--------------------------:|:--------------------------:|
+[Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Freenode (IRC): #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest|) | [Wiki](https://github.com/calamares/calamares/wiki)
+----------------------------------------------------------------- | ------------------------------------------------------------ | ----------------------------- | ------------------------------------------------------------------------------------------ | ---------------------------------------------------
 
 > Calamares is a distribution-independent system installer, with an advanced partitioning
 > feature for both manual and automated partitioning operations. Calamares is designed to

From a1d45122ebe6a36a185c2dc52b8267562a973a44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Sat, 31 Oct 2020 17:53:11 -0400
Subject: [PATCH 135/228] [partition] Update partition.conf

---
 src/modules/partition/partition.conf | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index 95f7d0576..41652fe7d 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -12,7 +12,8 @@ efiSystemPartition:     "/boot/efi"
 # If nothing is specified, the default size of 300MiB will be used.
 # efiSystemPartitionSize:     300M
 
-# This optional setting specifies the name of the EFI system partition.
+# This optional setting specifies the name of the EFI system partition (see
+# PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
 # If nothing is specified, the partition name is left unset.
 # efiSystemPartitionName:     EFI
 
@@ -48,7 +49,8 @@ userSwapChoices:
     # - reuse     # Re-use existing swap, but don't create any (unsupported right now)
     - file      # To swap file instead of partition
 
-# This optional setting specifies the name of the swap partition.
+# This optional setting specifies the name of the swap partition (see
+# PARTLABEL; gpt only; requires KPMCore >= 4.2.0).
 # If nothing is specified, the partition name is left unset.
 # swapPartitionName:      swap
 

From 9d930ad9cca6a61b8690abb29915e6c502ab0e4f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 31 Oct 2020 23:04:47 +0100
Subject: [PATCH 136/228] Docs: fix the table

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 981e0c583..a2cb426b7 100644
--- a/README.md
+++ b/README.md
@@ -10,8 +10,10 @@
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/5389/badge.svg)](https://scan.coverity.com/projects/5389)
 [![GitHub license](https://img.shields.io/github/license/calamares/calamares.svg)](https://github.com/calamares/calamares/blob/calamares/LICENSE)
 
-[Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Freenode (IRC): #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest|) | [Wiki](https://github.com/calamares/calamares/wiki)
------------------------------------------------------------------ | ------------------------------------------------------------ | ----------------------------- | ------------------------------------------------------------------------------------------ | ---------------------------------------------------
+
+| [Report a Bug](https://github.com/calamares/calamares/issues/new) | [Translate](https://www.transifex.com/projects/p/calamares/) | [Contribute](CONTRIBUTING.md) | [Freenode (IRC): #calamares](https://webchat.freenode.net/?channel=#calamares?nick=guest) | [Wiki](https://github.com/calamares/calamares/wiki) |
+|:--:|:--:|:--:|:--:|:--:|
+
 
 > Calamares is a distribution-independent system installer, with an advanced partitioning
 > feature for both manual and automated partitioning operations. Calamares is designed to

From 3967cfe0ebcccba1b392b96930090965093663cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Tue, 27 Oct 2020 09:59:18 -0400
Subject: [PATCH 137/228] [partition] Group EFI things together

---
 .../partition/core/PartitionActions.cpp       | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index a78e8ff53..5207d8947 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -97,21 +97,6 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
     // empty and a EFI boot partition, while BIOS starts at
     // the 1MiB boundary (usually sector 2048).
     int empty_space_sizeB = isEfi ? 2_MiB : 1_MiB;
-    int uefisys_part_sizeB = 0_MiB;
-
-    if ( isEfi )
-    {
-        if ( gs->contains( "efiSystemPartitionSize" ) )
-        {
-            CalamaresUtils::Partition::PartitionSize part_size
-                = CalamaresUtils::Partition::PartitionSize( gs->value( "efiSystemPartitionSize" ).toString() );
-            uefisys_part_sizeB = part_size.toBytes( dev->capacity() );
-        }
-        else
-        {
-            uefisys_part_sizeB = 300_MiB;
-        }
-    }
 
     // Since sectors count from 0, if the space is 2048 sectors in size,
     // the first free sector has number 2048 (and there are 2048 sectors
@@ -128,6 +113,14 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
 
     if ( isEfi )
     {
+        int uefisys_part_sizeB = 300_MiB;
+        if ( gs->contains( "efiSystemPartitionSize" ) )
+        {
+            CalamaresUtils::Partition::PartitionSize part_size
+                = CalamaresUtils::Partition::PartitionSize( gs->value( "efiSystemPartitionSize" ).toString() );
+            uefisys_part_sizeB = part_size.toBytes( dev->capacity() );
+        }
+
         qint64 efiSectorCount = CalamaresUtils::bytesToSectors( uefisys_part_sizeB, dev->logicalSize() );
         Q_ASSERT( efiSectorCount > 0 );
 

From 0a44ce381e80517bd78ddce161e4614c11b9735b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 31 Oct 2020 23:16:48 +0100
Subject: [PATCH 138/228] [partition] Reduce warnings (Clang, FreeBSD)

- remove unused this captures from lambda
- rename variables that are short, cryptic, and shadowed
- remove documentation for parameters that don't exist
---
 src/modules/partition/gui/ChoicePage.cpp | 27 +++++++++++++-----------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index a91c9a8e1..2b68cafe7 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -906,7 +906,9 @@ ChoicePage::updateDeviceStatePreview()
         m_beforePartitionBarsView->setSelectionMode( QAbstractItemView::SingleSelection );
         m_beforePartitionLabelsView->setSelectionMode( QAbstractItemView::SingleSelection );
         break;
-    default:
+    case InstallChoice::NoChoice:
+    case InstallChoice::Erase:
+    case InstallChoice::Manual:
         m_beforePartitionBarsView->setSelectionMode( QAbstractItemView::NoSelection );
         m_beforePartitionLabelsView->setSelectionMode( QAbstractItemView::NoSelection );
     }
@@ -990,7 +992,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
         m_previewAfterFrame->show();
         m_previewAfterLabel->show();
 
-        SelectionFilter filter = [this]( const QModelIndex& index ) {
+        SelectionFilter filter = []( const QModelIndex& index ) {
             return PartUtils::canBeResized(
                 static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ) );
         };
@@ -1079,7 +1081,7 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
         }
         else
         {
-            SelectionFilter filter = [this]( const QModelIndex& index ) {
+            SelectionFilter filter = []( const QModelIndex& index ) {
                 return PartUtils::canBeReplaced(
                     static_cast< Partition* >( index.data( PartitionModel::PartitionPtrRole ).value< void* >() ) );
             };
@@ -1125,7 +1127,9 @@ ChoicePage::updateActionChoicePreview( InstallChoice choice )
     case InstallChoice::Alongside:
         previewSelectionMode = QAbstractItemView::SingleSelection;
         break;
-    default:
+    case InstallChoice::NoChoice:
+    case InstallChoice::Erase:
+    case InstallChoice::Manual:
         previewSelectionMode = QAbstractItemView::NoSelection;
     }
 
@@ -1179,15 +1183,15 @@ ChoicePage::setupEfiSystemPartitionSelector()
 QComboBox*
 ChoicePage::createBootloaderComboBox( QWidget* parent )
 {
-    QComboBox* bcb = new QComboBox( parent );
-    bcb->setModel( m_core->bootLoaderModel() );
+    QComboBox* comboForBootloader = new QComboBox( parent );
+    comboForBootloader->setModel( m_core->bootLoaderModel() );
 
     // When the chosen bootloader device changes, we update the choice in the PCM
-    connect( bcb, QOverload< int >::of( &QComboBox::currentIndexChanged ), this, [this]( int newIndex ) {
-        QComboBox* bcb = qobject_cast< QComboBox* >( sender() );
-        if ( bcb )
+    connect( comboForBootloader, QOverload< int >::of( &QComboBox::currentIndexChanged ), this, [this]( int newIndex ) {
+        QComboBox* bootloaderCombo = qobject_cast< QComboBox* >( sender() );
+        if ( bootloaderCombo )
         {
-            QVariant var = bcb->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
+            QVariant var = bootloaderCombo->itemData( newIndex, BootLoaderModel::BootLoaderPathRole );
             if ( !var.isValid() )
             {
                 return;
@@ -1196,7 +1200,7 @@ ChoicePage::createBootloaderComboBox( QWidget* parent )
         }
     } );
 
-    return bcb;
+    return comboForBootloader;
 }
 
 
@@ -1220,7 +1224,6 @@ operator<<( QDebug& s, PartitionIterator& it )
  * @brief ChoicePage::setupActions happens every time a new Device* is selected in the
  *      device picker. Sets up the text and visibility of the partitioning actions based
  *      on the currently selected Device*, bootloader and os-prober output.
- * @param currentDevice
  */
 void
 ChoicePage::setupActions()

From 4d444cbfbb1b09efea32ee1b5432bfc3d1d9893b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 31 Oct 2020 23:37:06 +0100
Subject: [PATCH 139/228] [partition] Reduce warnings (Clang, FreeBSD)

The code doesn't match the comment: there are no by-ref captures
in the code, and the shadowing of parameters and local variables
is confusing. Remove one variable that is passed in as an argument
(and just pass the value as argument) and copy-capture the other
rather than doing weird argument passing.
---
 src/modules/partition/gui/ChoicePage.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/modules/partition/gui/ChoicePage.cpp b/src/modules/partition/gui/ChoicePage.cpp
index 2b68cafe7..35aec51e4 100644
--- a/src/modules/partition/gui/ChoicePage.cpp
+++ b/src/modules/partition/gui/ChoicePage.cpp
@@ -736,14 +736,12 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
         return;
     }
 
+    // This will be deleted by the second lambda, below.
     QString* homePartitionPath = new QString();
-    bool doReuseHomePartition = m_reuseHomeCheckBox->isChecked();
 
-    // NOTE: using by-ref captures because we need to write homePartitionPath and
-    //       doReuseHomePartition *after* the device revert, for later use.
     ScanningDialog::run(
         QtConcurrent::run(
-            [this, current]( QString* homePartitionPath, bool doReuseHomePartition ) {
+            [this, current, homePartitionPath]( bool doReuseHomePartition ) {
                 QMutexLocker locker( &m_coreMutex );
 
                 if ( m_core->isDirty() )
@@ -823,9 +821,8 @@ ChoicePage::doReplaceSelectedPartition( const QModelIndex& current )
                     }
                 }
             },
-            homePartitionPath,
-            doReuseHomePartition ),
-        [=] {
+            m_reuseHomeCheckBox->isChecked() ),
+        [this, homePartitionPath] {
             m_reuseHomeCheckBox->setVisible( !homePartitionPath->isEmpty() );
             if ( !homePartitionPath->isEmpty() )
                 m_reuseHomeCheckBox->setText( tr( "Reuse %1 as home partition for %2." )

From c41ff94f8aca8020c274ebf52a36381d47374d87 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sat, 31 Oct 2020 23:48:20 +0100
Subject: [PATCH 140/228] [locale] Reduce warnings (C++17)

Now that Calamares is compiled as C++17, we get this:

src/modules/locale/timezonewidget/TimeZoneImage.cpp:28:55: warning: out-of-line definition of constexpr static data member is redundant in C++17 and is deprecated [-Wdeprecated]
/* static constexpr */ const QSize TimeZoneImageList::imageSize;
---
 src/modules/locale/timezonewidget/TimeZoneImage.cpp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/modules/locale/timezonewidget/TimeZoneImage.cpp b/src/modules/locale/timezonewidget/TimeZoneImage.cpp
index 54aa1afd5..ad772ef63 100644
--- a/src/modules/locale/timezonewidget/TimeZoneImage.cpp
+++ b/src/modules/locale/timezonewidget/TimeZoneImage.cpp
@@ -24,9 +24,6 @@ static_assert( TimeZoneImageList::zoneCount == ( sizeof( zoneNames ) / sizeof( z
 
 #define ZONE_NAME QStringLiteral( "zone" )
 
-/* static constexpr */ const int TimeZoneImageList::zoneCount;
-/* static constexpr */ const QSize TimeZoneImageList::imageSize;
-
 static_assert( TimeZoneImageList::zoneCount == 37, "Incorrect number of zones" );
 
 TimeZoneImageList::TimeZoneImageList() {}

From d26fde664745f4b35751f26106d325ac02f08974 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Nov 2020 00:05:05 +0100
Subject: [PATCH 141/228] [partition] Reduce warnings

- Add a helper header that munges the warnings-settings so that
  KPMcore headers can be included.
---
 src/libcalamares/partition/KPMHelper.h        | 36 +++++++++++++++++++
 .../partition/tests/PartitionJobTests.cpp     |  4 +--
 2 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 src/libcalamares/partition/KPMHelper.h

diff --git a/src/libcalamares/partition/KPMHelper.h b/src/libcalamares/partition/KPMHelper.h
new file mode 100644
index 000000000..900c973a2
--- /dev/null
+++ b/src/libcalamares/partition/KPMHelper.h
@@ -0,0 +1,36 @@
+/* === This file is part of Calamares - <https://calamares.io> ===
+ *
+ *   SPDX-FileCopyrightText: 2020 Adriaan de Groot <groot@kde.org>
+ *   SPDX-License-Identifier: GPL-3.0-or-later
+ *
+ *   Calamares is Free Software: see the License-Identifier above.
+ *
+ */
+
+/*
+ * KPMCore header file inclusion.
+ *
+ * Includes the system KPMCore headers without warnings (by switching off
+ * the expected warnings).
+ */
+#ifndef PARTITION_KPMHELPER_H
+#define PARTITION_KPMHELPER_H
+
+// The kpmcore headers are not C++17 warning-proof, especially
+// with picky compilers like Clang 10. Since we use Clang for the
+// find-all-the-warnings case, switch those warnings off for
+// the we-can't-change-them system headers.
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdocumentation"
+#pragma clang diagnostic ignored "-Wsuggest-destructor-override"
+#endif
+
+#include <backend/corebackend.h>
+#include <fs/filesystemfactory.h>
+
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
+#endif
diff --git a/src/modules/partition/tests/PartitionJobTests.cpp b/src/modules/partition/tests/PartitionJobTests.cpp
index 2b0b1a1dc..204819fef 100644
--- a/src/modules/partition/tests/PartitionJobTests.cpp
+++ b/src/modules/partition/tests/PartitionJobTests.cpp
@@ -15,14 +15,12 @@
 #include "jobs/CreatePartitionTableJob.h"
 #include "jobs/ResizePartitionJob.h"
 
+#include "partition/KPMHelper.h"
 #include "partition/KPMManager.h"
 #include "partition/PartitionQuery.h"
 #include "utils/Logger.h"
 #include "utils/Units.h"
 
-#include <backend/corebackend.h>
-#include <fs/filesystemfactory.h>
-
 #include <QEventLoop>
 #include <QProcess>
 #include <QtTest/QtTest>

From 4a08fdbb92fbdd1dd5ec13bfb99ceca6fd2fb407 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Nov 2020 00:20:17 +0100
Subject: [PATCH 142/228] [partition] Reduce warnings from KPMCore

- make KPMHelper.h an "everything include" and suppress warnings
  from it, then use it in the tests.
---
 src/libcalamares/partition/KPMHelper.h             | 7 +++++++
 src/modules/partition/tests/CreateLayoutsTests.cpp | 4 ----
 src/modules/partition/tests/CreateLayoutsTests.h   | 3 ++-
 src/modules/partition/tests/PartitionJobTests.h    | 7 +------
 4 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/libcalamares/partition/KPMHelper.h b/src/libcalamares/partition/KPMHelper.h
index 900c973a2..f6007b119 100644
--- a/src/libcalamares/partition/KPMHelper.h
+++ b/src/libcalamares/partition/KPMHelper.h
@@ -24,9 +24,16 @@
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdocumentation"
 #pragma clang diagnostic ignored "-Wsuggest-destructor-override"
+#pragma clang diagnostic ignored "-Winconsistent-missing-destructor-override"
 #endif
 
 #include <backend/corebackend.h>
+#include <core/device.h>
+#include <core/lvmdevice.h>
+#include <core/partition.h>
+#include <core/partitionrole.h>
+#include <core/partitiontable.h>
+#include <fs/filesystem.h>
 #include <fs/filesystemfactory.h>
 
 #ifdef __clang__
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index 6a56eee99..fb991fc82 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -15,10 +15,6 @@
 #include "partition/KPMManager.h"
 #include "utils/Logger.h"
 
-#include <core/lvmdevice.h>
-#include <core/partition.h>
-#include <fs/filesystemfactory.h>
-
 #include <memory>
 
 #include <QtTest/QtTest>
diff --git a/src/modules/partition/tests/CreateLayoutsTests.h b/src/modules/partition/tests/CreateLayoutsTests.h
index 2ecc7b634..5953b06a7 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.h
+++ b/src/modules/partition/tests/CreateLayoutsTests.h
@@ -10,8 +10,9 @@
 #ifndef CLEARMOUNTSJOBTESTS_H
 #define CLEARMOUNTSJOBTESTS_H
 
+#include "partition/KPMHelper.h"
+
 #include <QObject>
-#include <core/device.h>
 
 class CreateLayoutsTests : public QObject
 {
diff --git a/src/modules/partition/tests/PartitionJobTests.h b/src/modules/partition/tests/PartitionJobTests.h
index c2c01088f..9e4455ddc 100644
--- a/src/modules/partition/tests/PartitionJobTests.h
+++ b/src/modules/partition/tests/PartitionJobTests.h
@@ -12,12 +12,7 @@
 
 #include "JobQueue.h"
 
-// CalaPM
-#include <core/device.h>
-#include <core/partition.h>
-#include <core/partitionrole.h>
-#include <core/partitiontable.h>
-#include <fs/filesystem.h>
+#include "partition/KPMHelper.h"
 
 // Qt
 #include <QObject>

From b15a76804c53da0d2d1fe39c025c421e60c354a0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Nov 2020 12:41:21 +0100
Subject: [PATCH 143/228] i18n: bogus Tajik keyboard translations

---
 lang/kb_tg.ts | 4609 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 4609 insertions(+)
 create mode 100644 lang/kb_tg.ts

diff --git a/lang/kb_tg.ts b/lang/kb_tg.ts
new file mode 100644
index 000000000..10b48e701
--- /dev/null
+++ b/lang/kb_tg.ts
@@ -0,0 +1,4609 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="22"/>
+        <source>A4Tech KB-21</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="23"/>
+        <source>A4Tech KBS-8</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="24"/>
+        <source>A4Tech Wireless Desktop RFKB-23</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="25"/>
+        <source>Acer AirKey V</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="26"/>
+        <source>Acer C300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="27"/>
+        <source>Acer Ferrari 4000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="28"/>
+        <source>Acer laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="29"/>
+        <source>Advance Scorpius KI</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="30"/>
+        <source>Apple</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="31"/>
+        <source>Apple Aluminium (ANSI)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="32"/>
+        <source>Apple Aluminium (ISO)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="33"/>
+        <source>Apple Aluminium (JIS)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="34"/>
+        <source>Apple laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="35"/>
+        <source>Asus laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="36"/>
+        <source>Azona RF2300 wireless Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="37"/>
+        <source>BTC 5090</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="38"/>
+        <source>BTC 5113RF Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="39"/>
+        <source>BTC 5126T</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="40"/>
+        <source>BTC 6301URF</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="41"/>
+        <source>BTC 9000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="42"/>
+        <source>BTC 9000A</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="43"/>
+        <source>BTC 9001AH</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="44"/>
+        <source>BTC 9019U</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="45"/>
+        <source>BTC 9116U Mini Wireless Internet and Gaming</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="46"/>
+        <source>BenQ X-Touch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="47"/>
+        <source>BenQ X-Touch 730</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="48"/>
+        <source>BenQ X-Touch 800</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="49"/>
+        <source>Brother Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="50"/>
+        <source>Cherry B.UNLIMITED</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="51"/>
+        <source>Cherry Blue Line CyBo@rd</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="52"/>
+        <source>Cherry Blue Line CyBo@rd (alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="53"/>
+        <source>Cherry CyBo@rd USB-Hub</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="54"/>
+        <source>Cherry CyMotion Expert</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="55"/>
+        <source>Cherry CyMotion Master Linux</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="56"/>
+        <source>Cherry CyMotion Master XPress</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="57"/>
+        <source>Chicony Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="58"/>
+        <source>Chicony KB-9885</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="59"/>
+        <source>Chicony KU-0108</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="60"/>
+        <source>Chicony KU-0420</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="61"/>
+        <source>Chromebook</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="62"/>
+        <source>Classmate PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="63"/>
+        <source>Compaq Armada laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="64"/>
+        <source>Compaq Easy Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="65"/>
+        <source>Compaq Internet (13 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="66"/>
+        <source>Compaq Internet (18 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="67"/>
+        <source>Compaq Internet (7 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="68"/>
+        <source>Compaq Presario laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="69"/>
+        <source>Compaq iPaq</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="70"/>
+        <source>Creative Desktop Wireless 7000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="71"/>
+        <source>DTK2000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="72"/>
+        <source>Dell</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="73"/>
+        <source>Dell 101-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="74"/>
+        <source>Dell Inspiron 6000/8000 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="75"/>
+        <source>Dell Latitude laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="76"/>
+        <source>Dell Precision M laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="77"/>
+        <source>Dell Precision M65 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="78"/>
+        <source>Dell SK-8125</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="79"/>
+        <source>Dell SK-8135</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="80"/>
+        <source>Dell USB Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="81"/>
+        <source>Dexxa Wireless Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="82"/>
+        <source>Diamond 9801/9802</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="83"/>
+        <source>Ennyah DKB-1008</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="84"/>
+        <source>Everex STEPnote</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="85"/>
+        <source>FL90</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="86"/>
+        <source>Fujitsu-Siemens Amilo laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="87"/>
+        <source>Generic 101-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 101-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="88"/>
+        <source>Generic 102-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 102-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="89"/>
+        <source>Generic 104-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 104-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="90"/>
+        <source>Generic 104-key PC with L-shaped Enter key</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="91"/>
+        <source>Generic 105-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 105-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="92"/>
+        <source>Generic 86-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 86-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="93"/>
+        <source>Genius Comfy KB-12e</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="94"/>
+        <source>Genius Comfy KB-16M/Multimedia KWD-910</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="95"/>
+        <source>Genius Comfy KB-21e-Scroll</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="96"/>
+        <source>Genius KB-19e NB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="97"/>
+        <source>Genius KKB-2050HS</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="98"/>
+        <source>Gyration</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="99"/>
+        <source>Happy Hacking</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="100"/>
+        <source>Happy Hacking for Mac</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="101"/>
+        <source>Hewlett-Packard Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="102"/>
+        <source>Hewlett-Packard Mini 110 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="103"/>
+        <source>Hewlett-Packard NEC SK-2500 Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="104"/>
+        <source>Hewlett-Packard Omnibook 500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="105"/>
+        <source>Hewlett-Packard Omnibook 500 FA</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="106"/>
+        <source>Hewlett-Packard Omnibook 6000/6100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="107"/>
+        <source>Hewlett-Packard Omnibook XE3 GC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="108"/>
+        <source>Hewlett-Packard Omnibook XE3 GF</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="109"/>
+        <source>Hewlett-Packard Omnibook XT1000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="110"/>
+        <source>Hewlett-Packard Pavilion ZT1100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="111"/>
+        <source>Hewlett-Packard Pavilion dv5</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="112"/>
+        <source>Hewlett-Packard nx9020</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="113"/>
+        <source>Honeywell Euroboard</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="114"/>
+        <source>IBM Rapid Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="115"/>
+        <source>IBM Rapid Access II</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="116"/>
+        <source>IBM Space Saver</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="117"/>
+        <source>IBM ThinkPad 560Z/600/600E/A22E</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="118"/>
+        <source>IBM ThinkPad R60/T60/R61/T61</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="119"/>
+        <source>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="120"/>
+        <source>Keytronic FlexPro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="121"/>
+        <source>Kinesis</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="122"/>
+        <source>Logitech</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="123"/>
+        <source>Logitech Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="124"/>
+        <source>Logitech Cordless Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="125"/>
+        <source>Logitech Cordless Desktop (alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="126"/>
+        <source>Logitech Cordless Desktop EX110</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="127"/>
+        <source>Logitech Cordless Desktop LX-300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="128"/>
+        <source>Logitech Cordless Desktop Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="129"/>
+        <source>Logitech Cordless Desktop Optical</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="130"/>
+        <source>Logitech Cordless Desktop Pro (2nd alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="131"/>
+        <source>Logitech Cordless Desktop iTouch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="132"/>
+        <source>Logitech Cordless Freedom/Desktop Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="133"/>
+        <source>Logitech G15 extra keys via G15daemon</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="134"/>
+        <source>Logitech Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="135"/>
+        <source>Logitech Internet 350</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="136"/>
+        <source>Logitech Internet Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="137"/>
+        <source>Logitech Ultra-X</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="138"/>
+        <source>Logitech Ultra-X Cordless Media Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="139"/>
+        <source>Logitech diNovo</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="140"/>
+        <source>Logitech diNovo Edge</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="141"/>
+        <source>Logitech iTouch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="142"/>
+        <source>Logitech iTouch Cordless Y-RB6</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="143"/>
+        <source>Logitech iTouch Internet Navigator SE</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="144"/>
+        <source>Logitech iTouch Internet Navigator SE USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="145"/>
+        <source>MacBook/MacBook Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="146"/>
+        <source>MacBook/MacBook Pro (intl.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="147"/>
+        <source>Macintosh</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="148"/>
+        <source>Macintosh Old</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="149"/>
+        <source>Memorex MX1998</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="150"/>
+        <source>Memorex MX2500 EZ-Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="151"/>
+        <source>Memorex MX2750</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="152"/>
+        <source>Microsoft Comfort Curve 2000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="153"/>
+        <source>Microsoft Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="154"/>
+        <source>Microsoft Internet Pro (Swedish)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="155"/>
+        <source>Microsoft Natural</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="156"/>
+        <source>Microsoft Natural Elite</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="157"/>
+        <source>Microsoft Natural Ergonomic 4000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="158"/>
+        <source>Microsoft Natural Pro OEM</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="159"/>
+        <source>Microsoft Natural Pro USB/Internet Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="160"/>
+        <source>Microsoft Natural Pro/Internet Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="161"/>
+        <source>Microsoft Natural Wireless Ergonomic 7000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="162"/>
+        <source>Microsoft Office Keyboard</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="163"/>
+        <source>Microsoft Surface</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="164"/>
+        <source>Microsoft Wireless Multimedia 1.0A</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="165"/>
+        <source>NEC SK-1300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="166"/>
+        <source>NEC SK-2500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="167"/>
+        <source>NEC SK-6200</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="168"/>
+        <source>NEC SK-7100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="169"/>
+        <source>Northgate OmniKey 101</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="170"/>
+        <source>OLPC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="171"/>
+        <source>Ortek Multimedia/Internet MCK-800</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="172"/>
+        <source>PC-98</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="173"/>
+        <source>Propeller Voyager KTEZ-1000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="174"/>
+        <source>QTronix Scorpius 98N+</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="175"/>
+        <source>SVEN Ergonomic 2500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="176"/>
+        <source>SVEN Slim 303</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="177"/>
+        <source>Samsung SDM 4500P</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="178"/>
+        <source>Samsung SDM 4510P</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="179"/>
+        <source>Sanwa Supply SKB-KG3</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="180"/>
+        <source>Silvercrest Multimedia Wireless</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="181"/>
+        <source>SteelSeries Apex 300 (Apex RAW)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="182"/>
+        <source>Sun Type 6 (Japanese)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="183"/>
+        <source>Sun Type 6 USB (Japanese)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="184"/>
+        <source>Sun Type 6 USB (Unix)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="185"/>
+        <source>Sun Type 6/7 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="186"/>
+        <source>Sun Type 6/7 USB (European)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="187"/>
+        <source>Sun Type 7 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="188"/>
+        <source>Sun Type 7 USB (European)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="189"/>
+        <source>Sun Type 7 USB (Japanese)/Japanese 106-key</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="190"/>
+        <source>Sun Type 7 USB (Unix)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="191"/>
+        <source>Super Power Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="192"/>
+        <source>Symplon PaceBook tablet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="193"/>
+        <source>Targa Visionary 811</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="194"/>
+        <source>Toshiba Satellite S3000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="195"/>
+        <source>Truly Ergonomic 227</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="196"/>
+        <source>Truly Ergonomic 229</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="197"/>
+        <source>Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="198"/>
+        <source>Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="199"/>
+        <source>Trust Direct Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="200"/>
+        <source>Trust Slimline</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="201"/>
+        <source>Trust Wireless Classic</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="202"/>
+        <source>TypeMatrix EZ-Reach 2020</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="203"/>
+        <source>TypeMatrix EZ-Reach 2030 PS2</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="204"/>
+        <source>TypeMatrix EZ-Reach 2030 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="205"/>
+        <source>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="206"/>
+        <source>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="207"/>
+        <source>Unitek KB-1925</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="208"/>
+        <source>ViewSonic KU-306 Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="209"/>
+        <source>Winbook Model XP5</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="210"/>
+        <source>Yahoo! Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="211"/>
+        <source>eMachines m6800 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="222"/>
+        <source>Afghani</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="223"/>
+        <source>Albanian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="224"/>
+        <source>Amharic</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="225"/>
+        <source>Arabic</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="226"/>
+        <source>Arabic (Morocco)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="227"/>
+        <source>Arabic (Syria)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="228"/>
+        <source>Armenian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="229"/>
+        <source>Azerbaijani</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="230"/>
+        <source>Bambara</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="231"/>
+        <source>Bangla</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="232"/>
+        <source>Belarusian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="233"/>
+        <source>Belgian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="234"/>
+        <source>Bosnian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="235"/>
+        <source>Braille</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="236"/>
+        <source>Bulgarian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="237"/>
+        <source>Burmese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="238"/>
+        <source>Chinese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="239"/>
+        <source>Croatian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="240"/>
+        <source>Czech</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="241"/>
+        <source>Danish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="242"/>
+        <source>Dhivehi</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="243"/>
+        <source>Dutch</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="244"/>
+        <source>Dzongkha</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="245"/>
+        <source>English (Australian)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="246"/>
+        <source>English (Cameroon)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="247"/>
+        <source>English (Ghana)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="248"/>
+        <source>English (Nigeria)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="249"/>
+        <source>English (South Africa)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="250"/>
+        <source>English (UK)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="251"/>
+        <source>English (US)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="252"/>
+        <source>Esperanto</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="253"/>
+        <source>Estonian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="254"/>
+        <source>Faroese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="255"/>
+        <source>Filipino</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="256"/>
+        <source>Finnish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="257"/>
+        <source>French</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="258"/>
+        <source>French (Canada)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="259"/>
+        <source>French (Democratic Republic of the Congo)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="260"/>
+        <source>French (Guinea)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="261"/>
+        <source>French (Togo)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="262"/>
+        <source>Georgian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="263"/>
+        <source>German</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="264"/>
+        <source>German (Austria)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="265"/>
+        <source>German (Switzerland)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="266"/>
+        <source>Greek</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="267"/>
+        <source>Hebrew</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="268"/>
+        <source>Hungarian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="269"/>
+        <source>Icelandic</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="270"/>
+        <source>Indian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="271"/>
+        <source>Indonesian (Arab Melayu, phonetic)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="272"/>
+        <source>Indonesian (Javanese)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="273"/>
+        <source>Iraqi</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="274"/>
+        <source>Irish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="275"/>
+        <source>Italian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="276"/>
+        <source>Japanese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="277"/>
+        <source>Japanese (PC-98)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="278"/>
+        <source>Kabylian (azerty layout, no dead keys)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="279"/>
+        <source>Kazakh</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="280"/>
+        <source>Khmer (Cambodia)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="281"/>
+        <source>Korean</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="282"/>
+        <source>Kyrgyz</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="283"/>
+        <source>Lao</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="284"/>
+        <source>Latvian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="285"/>
+        <source>Lithuanian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="286"/>
+        <source>Macedonian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="287"/>
+        <source>Malay (Jawi, Arabic Keyboard)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="288"/>
+        <source>Maltese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="289"/>
+        <source>Maori</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="290"/>
+        <source>Moldavian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="291"/>
+        <source>Mongolian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="292"/>
+        <source>Montenegrin</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="293"/>
+        <source>Nepali</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="294"/>
+        <source>Norwegian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="295"/>
+        <source>Persian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="296"/>
+        <source>Polish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="297"/>
+        <source>Portuguese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="298"/>
+        <source>Portuguese (Brazil)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="299"/>
+        <source>Romanian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="300"/>
+        <source>Russian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="301"/>
+        <source>Serbian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="302"/>
+        <source>Sinhala (phonetic)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="303"/>
+        <source>Slovak</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="304"/>
+        <source>Slovenian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="305"/>
+        <source>Spanish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="306"/>
+        <source>Spanish (Latin American)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="307"/>
+        <source>Swahili (Kenya)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="308"/>
+        <source>Swahili (Tanzania)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="309"/>
+        <source>Swedish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="310"/>
+        <source>Taiwanese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="311"/>
+        <source>Tajik</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="312"/>
+        <source>Thai</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="313"/>
+        <source>Tswana</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="314"/>
+        <source>Turkish</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="315"/>
+        <source>Turkmen</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="316"/>
+        <source>Ukrainian</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="317"/>
+        <source>Urdu (Pakistan)</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="318"/>
+        <source>Uzbek</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="319"/>
+        <source>Vietnamese</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="320"/>
+        <source>Wolof</source>
+        <comment>kb_layouts</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="331"/>
+        <source>Akan</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="332"/>
+        <source>Albanian (Plisi)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="333"/>
+        <source>Albanian (Veqilharxhi)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="334"/>
+        <source>Arabic (AZERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="335"/>
+        <source>Arabic (AZERTY, Eastern Arabic numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="336"/>
+        <source>Arabic (Algeria)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="337"/>
+        <source>Arabic (Buckwalter)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="338"/>
+        <source>Arabic (Eastern Arabic numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="339"/>
+        <source>Arabic (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="340"/>
+        <source>Arabic (OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="341"/>
+        <source>Arabic (Pakistan)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="342"/>
+        <source>Arabic (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="343"/>
+        <source>Arabic (QWERTY, Eastern Arabic numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="344"/>
+        <source>Armenian (alt. eastern)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="345"/>
+        <source>Armenian (alt. phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="346"/>
+        <source>Armenian (eastern)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="347"/>
+        <source>Armenian (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="348"/>
+        <source>Armenian (western)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="349"/>
+        <source>Asturian (Spain, with bottom-dot H and L)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="350"/>
+        <source>Avatime</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="351"/>
+        <source>Azerbaijani (Cyrillic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="352"/>
+        <source>Bangla (India)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="353"/>
+        <source>Bangla (India, Baishakhi Inscript)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="354"/>
+        <source>Bangla (India, Baishakhi)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="355"/>
+        <source>Bangla (India, Bornona)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="356"/>
+        <source>Bangla (India, Gitanjali)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="357"/>
+        <source>Bangla (India, Probhat)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="358"/>
+        <source>Bangla (Probhat)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="359"/>
+        <source>Bashkirian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="360"/>
+        <source>Belarusian (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="361"/>
+        <source>Belarusian (intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="362"/>
+        <source>Belarusian (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="363"/>
+        <source>Belgian (ISO, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="364"/>
+        <source>Belgian (Latin-9 only, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="365"/>
+        <source>Belgian (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="366"/>
+        <source>Belgian (Sun dead keys, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="367"/>
+        <source>Belgian (Wang 724 AZERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="368"/>
+        <source>Belgian (alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="369"/>
+        <source>Belgian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="370"/>
+        <source>Berber (Morocco, Tifinagh alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="371"/>
+        <source>Berber (Morocco, Tifinagh extended phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="372"/>
+        <source>Berber (Morocco, Tifinagh extended)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="373"/>
+        <source>Berber (Morocco, Tifinagh phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="374"/>
+        <source>Berber (Morocco, Tifinagh phonetic, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="375"/>
+        <source>Berber (Morocco, Tifinagh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="376"/>
+        <source>Bosnian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="377"/>
+        <source>Bosnian (US, with Bosnian digraphs)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="378"/>
+        <source>Bosnian (with Bosnian digraphs)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="379"/>
+        <source>Bosnian (with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="380"/>
+        <source>Braille (left-handed inverted thumb)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="381"/>
+        <source>Braille (left-handed)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="382"/>
+        <source>Braille (right-handed inverted thumb)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="383"/>
+        <source>Braille (right-handed)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="384"/>
+        <source>Bulgarian (enhanced)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="385"/>
+        <source>Bulgarian (new phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="386"/>
+        <source>Bulgarian (traditional phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="387"/>
+        <source>Burmese Zawgyi</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="388"/>
+        <source>Cameroon (AZERTY, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="389"/>
+        <source>Cameroon (Dvorak, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="390"/>
+        <source>Cameroon Multilingual (QWERTY, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="391"/>
+        <source>Canadian (intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="392"/>
+        <source>Canadian (intl., 1st part)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="393"/>
+        <source>Canadian (intl., 2nd part)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="394"/>
+        <source>Catalan (Spain, with middle-dot L)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="395"/>
+        <source>Cherokee</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="396"/>
+        <source>Chuvash</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="397"/>
+        <source>Chuvash (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="398"/>
+        <source>CloGaelach</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="399"/>
+        <source>Crimean Tatar (Turkish Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="400"/>
+        <source>Crimean Tatar (Turkish F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="401"/>
+        <source>Crimean Tatar (Turkish Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="402"/>
+        <source>Croatian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="403"/>
+        <source>Croatian (US, with Croatian digraphs)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="404"/>
+        <source>Croatian (with Croatian digraphs)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="405"/>
+        <source>Croatian (with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="406"/>
+        <source>Czech (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="407"/>
+        <source>Czech (QWERTY, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="408"/>
+        <source>Czech (QWERTY, extended backslash)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="409"/>
+        <source>Czech (UCW, only accented letters)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="410"/>
+        <source>Czech (US, Dvorak, UCW support)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="411"/>
+        <source>Czech (with &amp;lt;|&amp;gt; key)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="412"/>
+        <source>Danish (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="413"/>
+        <source>Danish (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="414"/>
+        <source>Danish (Macintosh, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="415"/>
+        <source>Danish (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="416"/>
+        <source>Danish (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="417"/>
+        <source>Dutch (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="418"/>
+        <source>Dutch (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="419"/>
+        <source>Dutch (standard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="420"/>
+        <source>English (Canada)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="421"/>
+        <source>English (Colemak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="422"/>
+        <source>English (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="423"/>
+        <source>English (Dvorak, alt. intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="424"/>
+        <source>English (Dvorak, intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="425"/>
+        <source>English (Dvorak, left-handed)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="426"/>
+        <source>English (Dvorak, right-handed)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="427"/>
+        <source>English (Ghana, GILLBT)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="428"/>
+        <source>English (Ghana, multilingual)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="429"/>
+        <source>English (India, with rupee)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="430"/>
+        <source>English (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="431"/>
+        <source>English (Mali, US, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="432"/>
+        <source>English (Mali, US, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="433"/>
+        <source>English (Norman)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="434"/>
+        <source>English (UK, Colemak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="435"/>
+        <source>English (UK, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="436"/>
+        <source>English (UK, Dvorak, with UK punctuation)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="437"/>
+        <source>English (UK, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="438"/>
+        <source>English (UK, Macintosh, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="439"/>
+        <source>English (UK, extended, Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="440"/>
+        <source>English (UK, intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="441"/>
+        <source>English (US, Symbolic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="442"/>
+        <source>English (US, alt. intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="443"/>
+        <source>English (US, euro on 5)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="444"/>
+        <source>English (US, intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="445"/>
+        <source>English (Workman)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="446"/>
+        <source>English (Workman, intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="447"/>
+        <source>English (classic Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="448"/>
+        <source>English (intl., with AltGr dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="449"/>
+        <source>English (programmer Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="450"/>
+        <source>English (the divide/multiply toggle the layout)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="451"/>
+        <source>Esperanto (Brazil, Nativo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="452"/>
+        <source>Esperanto (Portugal, Nativo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="453"/>
+        <source>Esperanto (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="454"/>
+        <source>Estonian (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="455"/>
+        <source>Estonian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="456"/>
+        <source>Estonian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="457"/>
+        <source>Ewe</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="458"/>
+        <source>Faroese (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="459"/>
+        <source>Filipino (Capewell-Dvorak, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="460"/>
+        <source>Filipino (Capewell-Dvorak, Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="461"/>
+        <source>Filipino (Capewell-QWERF 2006, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="462"/>
+        <source>Filipino (Capewell-QWERF 2006, Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="463"/>
+        <source>Filipino (Colemak, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="464"/>
+        <source>Filipino (Colemak, Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="465"/>
+        <source>Filipino (Dvorak, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="466"/>
+        <source>Filipino (Dvorak, Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="467"/>
+        <source>Filipino (QWERTY, Baybayin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="468"/>
+        <source>Finnish (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="469"/>
+        <source>Finnish (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="470"/>
+        <source>Finnish (classic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="471"/>
+        <source>Finnish (classic, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="472"/>
+        <source>French (AZERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="473"/>
+        <source>French (AZERTY, AFNOR)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="474"/>
+        <source>French (BEPO)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="475"/>
+        <source>French (BEPO, AFNOR)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="476"/>
+        <source>French (BEPO, Latin-9 only)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="477"/>
+        <source>French (Breton)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="478"/>
+        <source>French (Cameroon)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="479"/>
+        <source>French (Canada, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="480"/>
+        <source>French (Canada, legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="481"/>
+        <source>French (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="482"/>
+        <source>French (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="483"/>
+        <source>French (Mali, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="484"/>
+        <source>French (Morocco)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="485"/>
+        <source>French (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="486"/>
+        <source>French (Switzerland)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="487"/>
+        <source>French (Switzerland, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="488"/>
+        <source>French (Switzerland, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="489"/>
+        <source>French (Switzerland, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="490"/>
+        <source>French (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="491"/>
+        <source>French (alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="492"/>
+        <source>French (alt., Latin-9 only)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="493"/>
+        <source>French (alt., Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="494"/>
+        <source>French (alt., no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="495"/>
+        <source>French (legacy, alt.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="496"/>
+        <source>French (legacy, alt., Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="497"/>
+        <source>French (legacy, alt., no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="498"/>
+        <source>French (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="499"/>
+        <source>Friulian (Italy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="500"/>
+        <source>Fula</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="501"/>
+        <source>Ga</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="502"/>
+        <source>Georgian (France, AZERTY Tskapo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="503"/>
+        <source>Georgian (Italy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="504"/>
+        <source>Georgian (MESS)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="505"/>
+        <source>Georgian (ergonomic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="506"/>
+        <source>German (Austria, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="507"/>
+        <source>German (Austria, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="508"/>
+        <source>German (Austria, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="509"/>
+        <source>German (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="510"/>
+        <source>German (E1)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="511"/>
+        <source>German (E2)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="512"/>
+        <source>German (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="513"/>
+        <source>German (Macintosh, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="514"/>
+        <source>German (Neo 2)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="515"/>
+        <source>German (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="516"/>
+        <source>German (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="517"/>
+        <source>German (Switzerland, Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="518"/>
+        <source>German (Switzerland, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="519"/>
+        <source>German (Switzerland, legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="520"/>
+        <source>German (Switzerland, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="521"/>
+        <source>German (T3)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="522"/>
+        <source>German (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="523"/>
+        <source>German (dead acute)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="524"/>
+        <source>German (dead grave acute)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="525"/>
+        <source>German (dead tilde)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="526"/>
+        <source>German (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="527"/>
+        <source>Greek (extended)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="528"/>
+        <source>Greek (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="529"/>
+        <source>Greek (polytonic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="530"/>
+        <source>Greek (simple)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="531"/>
+        <source>Gujarati</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="532"/>
+        <source>Hanyu Pinyin (with AltGr dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="533"/>
+        <source>Hausa (Ghana)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="534"/>
+        <source>Hausa (Nigeria)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="535"/>
+        <source>Hawaiian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="536"/>
+        <source>Hebrew (Biblical, Tiro)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="537"/>
+        <source>Hebrew (lyx)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="538"/>
+        <source>Hebrew (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="539"/>
+        <source>Hindi (Bolnagri)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="540"/>
+        <source>Hindi (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="541"/>
+        <source>Hindi (Wx)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="542"/>
+        <source>Hungarian (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="543"/>
+        <source>Hungarian (QWERTY, 101-key, comma, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="544"/>
+        <source>Hungarian (QWERTY, 101-key, comma, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="545"/>
+        <source>Hungarian (QWERTY, 101-key, dot, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="546"/>
+        <source>Hungarian (QWERTY, 101-key, dot, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="547"/>
+        <source>Hungarian (QWERTY, 102-key, comma, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="548"/>
+        <source>Hungarian (QWERTY, 102-key, comma, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="549"/>
+        <source>Hungarian (QWERTY, 102-key, dot, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="550"/>
+        <source>Hungarian (QWERTY, 102-key, dot, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="551"/>
+        <source>Hungarian (QWERTZ, 101-key, comma, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="552"/>
+        <source>Hungarian (QWERTZ, 101-key, comma, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="553"/>
+        <source>Hungarian (QWERTZ, 101-key, dot, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="554"/>
+        <source>Hungarian (QWERTZ, 101-key, dot, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="555"/>
+        <source>Hungarian (QWERTZ, 102-key, comma, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="556"/>
+        <source>Hungarian (QWERTZ, 102-key, comma, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="557"/>
+        <source>Hungarian (QWERTZ, 102-key, dot, dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="558"/>
+        <source>Hungarian (QWERTZ, 102-key, dot, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="559"/>
+        <source>Hungarian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="560"/>
+        <source>Hungarian (standard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="561"/>
+        <source>Icelandic (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="562"/>
+        <source>Icelandic (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="563"/>
+        <source>Icelandic (Macintosh, legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="564"/>
+        <source>Icelandic (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="565"/>
+        <source>Icelandic (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="566"/>
+        <source>Igbo</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="567"/>
+        <source>Indic (phonetic, IPA)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="568"/>
+        <source>Indonesian (Arab Melayu, extended phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="569"/>
+        <source>Inuktitut</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="570"/>
+        <source>Irish (UnicodeExpert)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="571"/>
+        <source>Italian (IBM 142)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="572"/>
+        <source>Italian (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="573"/>
+        <source>Italian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="574"/>
+        <source>Italian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="575"/>
+        <source>Italian (intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="576"/>
+        <source>Italian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="577"/>
+        <source>Japanese (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="578"/>
+        <source>Japanese (Kana 86)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="579"/>
+        <source>Japanese (Kana)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="580"/>
+        <source>Japanese (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="581"/>
+        <source>Japanese (OADG 109A)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="582"/>
+        <source>Kabylian (Algeria, Tifinagh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="583"/>
+        <source>Kabylian (azerty layout, with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="584"/>
+        <source>Kabylian (qwerty-gb layout, with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="585"/>
+        <source>Kabylian (qwerty-us layout, with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="586"/>
+        <source>Kalmyk</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="587"/>
+        <source>Kannada</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="588"/>
+        <source>Kannada (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="589"/>
+        <source>Kashubian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="590"/>
+        <source>Kazakh (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="591"/>
+        <source>Kazakh (extended)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="592"/>
+        <source>Kazakh (with Russian)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="593"/>
+        <source>Kikuyu</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="594"/>
+        <source>Komi</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="595"/>
+        <source>Korean (101/104-key compatible)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="596"/>
+        <source>Kurdish (Iran, Arabic-Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="597"/>
+        <source>Kurdish (Iran, F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="598"/>
+        <source>Kurdish (Iran, Latin Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="599"/>
+        <source>Kurdish (Iran, Latin Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="600"/>
+        <source>Kurdish (Iraq, Arabic-Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="601"/>
+        <source>Kurdish (Iraq, F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="602"/>
+        <source>Kurdish (Iraq, Latin Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="603"/>
+        <source>Kurdish (Iraq, Latin Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="604"/>
+        <source>Kurdish (Syria, F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="605"/>
+        <source>Kurdish (Syria, Latin Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="606"/>
+        <source>Kurdish (Syria, Latin Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="607"/>
+        <source>Kurdish (Turkey, F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="608"/>
+        <source>Kurdish (Turkey, Latin Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="609"/>
+        <source>Kurdish (Turkey, Latin Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="610"/>
+        <source>Kyrgyz (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="611"/>
+        <source>Lao (STEA)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="612"/>
+        <source>Latvian (F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="613"/>
+        <source>Latvian (adapted)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="614"/>
+        <source>Latvian (apostrophe)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="615"/>
+        <source>Latvian (ergonomic, ŪGJRMV)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="616"/>
+        <source>Latvian (modern)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="617"/>
+        <source>Latvian (tilde)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="618"/>
+        <source>Lithuanian (IBM LST 1205-92)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="619"/>
+        <source>Lithuanian (LEKP)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="620"/>
+        <source>Lithuanian (LEKPa)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="621"/>
+        <source>Lithuanian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="622"/>
+        <source>Lithuanian (standard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="623"/>
+        <source>Lower Sorbian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="624"/>
+        <source>Lower Sorbian (QWERTZ)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="625"/>
+        <source>Macedonian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="626"/>
+        <source>Malay (Jawi, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="627"/>
+        <source>Malayalam</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="628"/>
+        <source>Malayalam (Lalitha)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="629"/>
+        <source>Malayalam (enhanced Inscript, with rupee)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="630"/>
+        <source>Maltese (UK, with AltGr overrides)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="631"/>
+        <source>Maltese (US layout with AltGr overrides)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="632"/>
+        <source>Maltese (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="633"/>
+        <source>Manipuri (Eeyek)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="634"/>
+        <source>Marathi (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="635"/>
+        <source>Marathi (enhanced Inscript)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="636"/>
+        <source>Mari</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="637"/>
+        <source>Mmuock</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="638"/>
+        <source>Moldavian (Gagauz)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="639"/>
+        <source>Mongolian (Bichig)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="640"/>
+        <source>Mongolian (Galik)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="641"/>
+        <source>Mongolian (Manchu Galik)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="642"/>
+        <source>Mongolian (Manchu)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="643"/>
+        <source>Mongolian (Todo Galik)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="644"/>
+        <source>Mongolian (Todo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="645"/>
+        <source>Mongolian (Xibe)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="646"/>
+        <source>Montenegrin (Cyrillic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="647"/>
+        <source>Montenegrin (Cyrillic, ZE and ZHE swapped)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="648"/>
+        <source>Montenegrin (Cyrillic, with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="649"/>
+        <source>Montenegrin (Latin, QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="650"/>
+        <source>Montenegrin (Latin, Unicode)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="651"/>
+        <source>Montenegrin (Latin, Unicode, QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="652"/>
+        <source>Montenegrin (Latin, with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="653"/>
+        <source>Northern Saami (Finland)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="654"/>
+        <source>Northern Saami (Norway)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="655"/>
+        <source>Northern Saami (Norway, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="656"/>
+        <source>Northern Saami (Sweden)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="657"/>
+        <source>Norwegian (Colemak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="658"/>
+        <source>Norwegian (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="659"/>
+        <source>Norwegian (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="660"/>
+        <source>Norwegian (Macintosh, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="661"/>
+        <source>Norwegian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="662"/>
+        <source>Norwegian (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="663"/>
+        <source>Occitan</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="664"/>
+        <source>Ogham</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="665"/>
+        <source>Ogham (IS434)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="666"/>
+        <source>Ol Chiki</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="667"/>
+        <source>Oriya</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="668"/>
+        <source>Ossetian (Georgia)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="669"/>
+        <source>Ossetian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="670"/>
+        <source>Ossetian (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="671"/>
+        <source>Pannonian Rusyn</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="672"/>
+        <source>Pashto</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="673"/>
+        <source>Pashto (Afghanistan, OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="674"/>
+        <source>Persian (Afghanistan, Dari OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="675"/>
+        <source>Persian (with Persian keypad)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="676"/>
+        <source>Polish (British keyboard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="677"/>
+        <source>Polish (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="678"/>
+        <source>Polish (Dvorak, with Polish quotes on key 1)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="679"/>
+        <source>Polish (Dvorak, with Polish quotes on quotemark key)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="680"/>
+        <source>Polish (QWERTZ)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="681"/>
+        <source>Polish (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="682"/>
+        <source>Polish (programmer Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="683"/>
+        <source>Portuguese (Brazil, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="684"/>
+        <source>Portuguese (Brazil, IBM/Lenovo ThinkPad)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="685"/>
+        <source>Portuguese (Brazil, Nativo for US keyboards)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="686"/>
+        <source>Portuguese (Brazil, Nativo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="687"/>
+        <source>Portuguese (Brazil, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="688"/>
+        <source>Portuguese (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="689"/>
+        <source>Portuguese (Macintosh, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="690"/>
+        <source>Portuguese (Macintosh, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="691"/>
+        <source>Portuguese (Nativo for US keyboards)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="692"/>
+        <source>Portuguese (Nativo)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="693"/>
+        <source>Portuguese (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="694"/>
+        <source>Portuguese (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="695"/>
+        <source>Punjabi (Gurmukhi Jhelum)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="696"/>
+        <source>Punjabi (Gurmukhi)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="697"/>
+        <source>Romanian (Germany)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="698"/>
+        <source>Romanian (Germany, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="699"/>
+        <source>Romanian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="700"/>
+        <source>Romanian (cedilla)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="701"/>
+        <source>Romanian (standard cedilla)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="702"/>
+        <source>Romanian (standard)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="703"/>
+        <source>Russian (Belarus)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="704"/>
+        <source>Russian (Czech, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="705"/>
+        <source>Russian (DOS)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="706"/>
+        <source>Russian (Georgia)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="707"/>
+        <source>Russian (Germany, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="708"/>
+        <source>Russian (Kazakhstan, with Kazakh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="709"/>
+        <source>Russian (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="710"/>
+        <source>Russian (Poland, phonetic Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="711"/>
+        <source>Russian (Sweden, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="712"/>
+        <source>Russian (Sweden, phonetic, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="713"/>
+        <source>Russian (US, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="714"/>
+        <source>Russian (Ukraine, standard RSTU)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="715"/>
+        <source>Russian (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="716"/>
+        <source>Russian (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="717"/>
+        <source>Russian (phonetic, AZERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="718"/>
+        <source>Russian (phonetic, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="719"/>
+        <source>Russian (phonetic, French)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="720"/>
+        <source>Russian (phonetic, Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="721"/>
+        <source>Russian (phonetic, YAZHERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="722"/>
+        <source>Russian (typewriter)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="723"/>
+        <source>Russian (typewriter, legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="724"/>
+        <source>Saisiyat (Taiwan)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="725"/>
+        <source>Samogitian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="726"/>
+        <source>Sanskrit (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="727"/>
+        <source>Serbian (Cyrillic, ZE and ZHE swapped)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="728"/>
+        <source>Serbian (Cyrillic, with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="729"/>
+        <source>Serbian (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="730"/>
+        <source>Serbian (Latin, QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="731"/>
+        <source>Serbian (Latin, Unicode)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="732"/>
+        <source>Serbian (Latin, Unicode, QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="733"/>
+        <source>Serbian (Latin, with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="734"/>
+        <source>Serbian (Russia)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="735"/>
+        <source>Serbo-Croatian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="736"/>
+        <source>Sicilian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="737"/>
+        <source>Silesian</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="738"/>
+        <source>Sindhi</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="739"/>
+        <source>Sinhala (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="740"/>
+        <source>Slovak (QWERTY)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="741"/>
+        <source>Slovak (QWERTY, extended backslash)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="742"/>
+        <source>Slovak (extended backslash)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="743"/>
+        <source>Slovenian (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="744"/>
+        <source>Slovenian (with guillemets)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="745"/>
+        <source>Spanish (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="746"/>
+        <source>Spanish (Latin American, Colemak for gaming)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="747"/>
+        <source>Spanish (Latin American, Colemak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="748"/>
+        <source>Spanish (Latin American, Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="749"/>
+        <source>Spanish (Latin American, Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="750"/>
+        <source>Spanish (Latin American, dead tilde)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="751"/>
+        <source>Spanish (Latin American, no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="752"/>
+        <source>Spanish (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="753"/>
+        <source>Spanish (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="754"/>
+        <source>Spanish (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="755"/>
+        <source>Spanish (dead tilde)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="756"/>
+        <source>Spanish (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="757"/>
+        <source>Swedish (Dvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="758"/>
+        <source>Swedish (Dvorak, intl.)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="759"/>
+        <source>Swedish (Macintosh)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="760"/>
+        <source>Swedish (Svdvorak)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="761"/>
+        <source>Swedish (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="762"/>
+        <source>Swedish (no dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="763"/>
+        <source>Swedish Sign Language</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="764"/>
+        <source>Syriac</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="765"/>
+        <source>Syriac (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="766"/>
+        <source>Taiwanese (indigenous)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="767"/>
+        <source>Tajik (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation>Тоҷикӣ (красіво)</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="768"/>
+        <source>Tamil (Inscript)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="769"/>
+        <source>Tamil (Sri Lanka, TamilNet &apos;99)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="770"/>
+        <source>Tamil (Sri Lanka, TamilNet &apos;99, TAB encoding)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="771"/>
+        <source>Tamil (TamilNet &apos;99 with Tamil numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="772"/>
+        <source>Tamil (TamilNet &apos;99)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="773"/>
+        <source>Tamil (TamilNet &apos;99, TAB encoding)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="774"/>
+        <source>Tamil (TamilNet &apos;99, TSCII encoding)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="775"/>
+        <source>Tatar</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="776"/>
+        <source>Telugu</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="777"/>
+        <source>Telugu (KaGaPa, phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="778"/>
+        <source>Telugu (Sarala)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="779"/>
+        <source>Thai (Pattachote)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="780"/>
+        <source>Thai (TIS-820.2538)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="781"/>
+        <source>Tibetan</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="782"/>
+        <source>Tibetan (with ASCII numerals)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="783"/>
+        <source>Turkish (Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="784"/>
+        <source>Turkish (F)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="785"/>
+        <source>Turkish (Germany)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="786"/>
+        <source>Turkish (Sun dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="787"/>
+        <source>Turkish (intl., with dead keys)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="788"/>
+        <source>Turkmen (Alt-Q)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="789"/>
+        <source>Udmurt</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="790"/>
+        <source>Ukrainian (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="791"/>
+        <source>Ukrainian (homophonic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="792"/>
+        <source>Ukrainian (legacy)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="793"/>
+        <source>Ukrainian (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="794"/>
+        <source>Ukrainian (standard RSTU)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="795"/>
+        <source>Ukrainian (typewriter)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="796"/>
+        <source>Urdu (Pakistan, CRULP)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="797"/>
+        <source>Urdu (Pakistan, NLA)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="798"/>
+        <source>Urdu (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="799"/>
+        <source>Urdu (alt. phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="800"/>
+        <source>Urdu (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="801"/>
+        <source>Uyghur</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="802"/>
+        <source>Uzbek (Afghanistan)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="803"/>
+        <source>Uzbek (Afghanistan, OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="804"/>
+        <source>Uzbek (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="805"/>
+        <source>Vietnamese (French)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="806"/>
+        <source>Vietnamese (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="807"/>
+        <source>Yakut</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="808"/>
+        <source>Yoruba</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+</TS>

From 1a5fa36fb68441ecc797410937c60c4cdbdd1e9b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Nov 2020 12:42:58 +0100
Subject: [PATCH 144/228] i18n: build keyboard translations

This is the Wrong Thing To Do, but we'll do it for now: build the
keyboard translations into the executable. In the medium term
they should move to the modules that use them, with the re-vamp
of how translation changes are signalled.
---
 src/calamares/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calamares/CMakeLists.txt b/src/calamares/CMakeLists.txt
index 94abb9f54..abea69a26 100644
--- a/src/calamares/CMakeLists.txt
+++ b/src/calamares/CMakeLists.txt
@@ -42,7 +42,7 @@ set( calamares_i18n_qrc_content "" )
 
 # calamares and qt language files
 foreach( lang ${CALAMARES_TRANSLATION_LANGUAGES} )
-    foreach( tlsource "calamares_${lang}" "tz_${lang}" )
+    foreach( tlsource "calamares_${lang}" "tz_${lang}" "kb_${lang}" )
         if( EXISTS "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts" )
             set( calamares_i18n_qrc_content "${calamares_i18n_qrc_content}<file>${tlsource}.qm</file>\n" )
             list( APPEND TS_FILES "${CMAKE_SOURCE_DIR}/lang/${tlsource}.ts" )

From f088efdf848fd986a1f803e9554c804721ecf777 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Nov 2020 13:46:32 +0100
Subject: [PATCH 145/228] [keyboard] Re-jig translation extraction

- Use classes to prompt lupdate to extract with a better
  context (e.g. the class name, rather than plain "QObject")
  so that the translation-lookup can use the named context.
- Add hard-coded "default" variant
- Add totally bogus Tajik translations, for testing purposes
---
 lang/kb_en.ts                                | 3556 ++++++++---------
 lang/kb_tg.ts                                | 3562 +++++++++---------
 src/modules/keyboard/Config.cpp              |    1 +
 src/modules/keyboard/KeyboardData_p.cxxtr    | 1559 ++++----
 src/modules/keyboard/KeyboardLayoutModel.cpp |   12 +
 src/modules/keyboard/KeyboardLayoutModel.h   |    4 +
 src/modules/keyboard/layout-extractor.py     |    8 +-
 7 files changed, 4379 insertions(+), 4323 deletions(-)

diff --git a/lang/kb_en.ts b/lang/kb_en.ts
index 11e29c61a..08dc54905 100644
--- a/lang/kb_en.ts
+++ b/lang/kb_en.ts
@@ -2,4605 +2,4617 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
 <context>
-    <name>QObject</name>
+    <name>kb_layouts</name>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="22"/>
-        <source>A4Tech KB-21</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="23"/>
-        <source>A4Tech KBS-8</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="24"/>
-        <source>A4Tech Wireless Desktop RFKB-23</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="25"/>
-        <source>Acer AirKey V</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="26"/>
-        <source>Acer C300</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="27"/>
-        <source>Acer Ferrari 4000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="28"/>
-        <source>Acer laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="29"/>
-        <source>Advance Scorpius KI</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="30"/>
-        <source>Apple</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="31"/>
-        <source>Apple Aluminium (ANSI)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="32"/>
-        <source>Apple Aluminium (ISO)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="33"/>
-        <source>Apple Aluminium (JIS)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="34"/>
-        <source>Apple laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="35"/>
-        <source>Asus laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="36"/>
-        <source>Azona RF2300 wireless Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="37"/>
-        <source>BTC 5090</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="38"/>
-        <source>BTC 5113RF Multimedia</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="39"/>
-        <source>BTC 5126T</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="40"/>
-        <source>BTC 6301URF</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="41"/>
-        <source>BTC 9000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="42"/>
-        <source>BTC 9000A</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="43"/>
-        <source>BTC 9001AH</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="44"/>
-        <source>BTC 9019U</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="45"/>
-        <source>BTC 9116U Mini Wireless Internet and Gaming</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="46"/>
-        <source>BenQ X-Touch</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="47"/>
-        <source>BenQ X-Touch 730</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="48"/>
-        <source>BenQ X-Touch 800</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="49"/>
-        <source>Brother Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="50"/>
-        <source>Cherry B.UNLIMITED</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="51"/>
-        <source>Cherry Blue Line CyBo@rd</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="52"/>
-        <source>Cherry Blue Line CyBo@rd (alt.)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="53"/>
-        <source>Cherry CyBo@rd USB-Hub</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="54"/>
-        <source>Cherry CyMotion Expert</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="55"/>
-        <source>Cherry CyMotion Master Linux</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="56"/>
-        <source>Cherry CyMotion Master XPress</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="57"/>
-        <source>Chicony Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="58"/>
-        <source>Chicony KB-9885</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="59"/>
-        <source>Chicony KU-0108</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="60"/>
-        <source>Chicony KU-0420</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="61"/>
-        <source>Chromebook</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="62"/>
-        <source>Classmate PC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="63"/>
-        <source>Compaq Armada laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="64"/>
-        <source>Compaq Easy Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="65"/>
-        <source>Compaq Internet (13 keys)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="66"/>
-        <source>Compaq Internet (18 keys)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="67"/>
-        <source>Compaq Internet (7 keys)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="68"/>
-        <source>Compaq Presario laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="69"/>
-        <source>Compaq iPaq</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="70"/>
-        <source>Creative Desktop Wireless 7000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="71"/>
-        <source>DTK2000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="72"/>
-        <source>Dell</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="73"/>
-        <source>Dell 101-key PC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="74"/>
-        <source>Dell Inspiron 6000/8000 laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="75"/>
-        <source>Dell Latitude laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="76"/>
-        <source>Dell Precision M laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="77"/>
-        <source>Dell Precision M65 laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="78"/>
-        <source>Dell SK-8125</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="79"/>
-        <source>Dell SK-8135</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="80"/>
-        <source>Dell USB Multimedia</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="81"/>
-        <source>Dexxa Wireless Desktop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="82"/>
-        <source>Diamond 9801/9802</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="83"/>
-        <source>Ennyah DKB-1008</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="84"/>
-        <source>Everex STEPnote</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="85"/>
-        <source>FL90</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="86"/>
-        <source>Fujitsu-Siemens Amilo laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="87"/>
-        <source>Generic 101-key PC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="88"/>
-        <source>Generic 102-key PC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="89"/>
-        <source>Generic 104-key PC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="90"/>
-        <source>Generic 104-key PC with L-shaped Enter key</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="91"/>
-        <source>Generic 105-key PC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="92"/>
-        <source>Generic 86-key PC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="93"/>
-        <source>Genius Comfy KB-12e</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="94"/>
-        <source>Genius Comfy KB-16M/Multimedia KWD-910</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="95"/>
-        <source>Genius Comfy KB-21e-Scroll</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="96"/>
-        <source>Genius KB-19e NB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="97"/>
-        <source>Genius KKB-2050HS</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="98"/>
-        <source>Gyration</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="99"/>
-        <source>Happy Hacking</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="100"/>
-        <source>Happy Hacking for Mac</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="101"/>
-        <source>Hewlett-Packard Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="102"/>
-        <source>Hewlett-Packard Mini 110 laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="103"/>
-        <source>Hewlett-Packard NEC SK-2500 Multimedia</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="104"/>
-        <source>Hewlett-Packard Omnibook 500</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="105"/>
-        <source>Hewlett-Packard Omnibook 500 FA</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="106"/>
-        <source>Hewlett-Packard Omnibook 6000/6100</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="107"/>
-        <source>Hewlett-Packard Omnibook XE3 GC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="108"/>
-        <source>Hewlett-Packard Omnibook XE3 GF</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="109"/>
-        <source>Hewlett-Packard Omnibook XT1000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="110"/>
-        <source>Hewlett-Packard Pavilion ZT1100</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="111"/>
-        <source>Hewlett-Packard Pavilion dv5</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="112"/>
-        <source>Hewlett-Packard nx9020</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="113"/>
-        <source>Honeywell Euroboard</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="114"/>
-        <source>IBM Rapid Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="115"/>
-        <source>IBM Rapid Access II</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="116"/>
-        <source>IBM Space Saver</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="117"/>
-        <source>IBM ThinkPad 560Z/600/600E/A22E</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="118"/>
-        <source>IBM ThinkPad R60/T60/R61/T61</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="119"/>
-        <source>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="120"/>
-        <source>Keytronic FlexPro</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="121"/>
-        <source>Kinesis</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="122"/>
-        <source>Logitech</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="123"/>
-        <source>Logitech Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="124"/>
-        <source>Logitech Cordless Desktop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="125"/>
-        <source>Logitech Cordless Desktop (alt.)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="126"/>
-        <source>Logitech Cordless Desktop EX110</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="127"/>
-        <source>Logitech Cordless Desktop LX-300</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="128"/>
-        <source>Logitech Cordless Desktop Navigator</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="129"/>
-        <source>Logitech Cordless Desktop Optical</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="130"/>
-        <source>Logitech Cordless Desktop Pro (2nd alt.)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="131"/>
-        <source>Logitech Cordless Desktop iTouch</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="132"/>
-        <source>Logitech Cordless Freedom/Desktop Navigator</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="133"/>
-        <source>Logitech G15 extra keys via G15daemon</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="134"/>
-        <source>Logitech Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="135"/>
-        <source>Logitech Internet 350</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="136"/>
-        <source>Logitech Internet Navigator</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="137"/>
-        <source>Logitech Ultra-X</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="138"/>
-        <source>Logitech Ultra-X Cordless Media Desktop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="139"/>
-        <source>Logitech diNovo</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="140"/>
-        <source>Logitech diNovo Edge</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="141"/>
-        <source>Logitech iTouch</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="142"/>
-        <source>Logitech iTouch Cordless Y-RB6</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="143"/>
-        <source>Logitech iTouch Internet Navigator SE</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="144"/>
-        <source>Logitech iTouch Internet Navigator SE USB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="145"/>
-        <source>MacBook/MacBook Pro</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="146"/>
-        <source>MacBook/MacBook Pro (intl.)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="147"/>
-        <source>Macintosh</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="148"/>
-        <source>Macintosh Old</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="149"/>
-        <source>Memorex MX1998</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="150"/>
-        <source>Memorex MX2500 EZ-Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="151"/>
-        <source>Memorex MX2750</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="152"/>
-        <source>Microsoft Comfort Curve 2000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="153"/>
-        <source>Microsoft Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="154"/>
-        <source>Microsoft Internet Pro (Swedish)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="155"/>
-        <source>Microsoft Natural</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="156"/>
-        <source>Microsoft Natural Elite</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="157"/>
-        <source>Microsoft Natural Ergonomic 4000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="158"/>
-        <source>Microsoft Natural Pro OEM</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="159"/>
-        <source>Microsoft Natural Pro USB/Internet Pro</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="160"/>
-        <source>Microsoft Natural Pro/Internet Pro</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="161"/>
-        <source>Microsoft Natural Wireless Ergonomic 7000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="162"/>
-        <source>Microsoft Office Keyboard</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="163"/>
-        <source>Microsoft Surface</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="164"/>
-        <source>Microsoft Wireless Multimedia 1.0A</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="165"/>
-        <source>NEC SK-1300</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="166"/>
-        <source>NEC SK-2500</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="167"/>
-        <source>NEC SK-6200</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="168"/>
-        <source>NEC SK-7100</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="169"/>
-        <source>Northgate OmniKey 101</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="170"/>
-        <source>OLPC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="171"/>
-        <source>Ortek Multimedia/Internet MCK-800</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="172"/>
-        <source>PC-98</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="173"/>
-        <source>Propeller Voyager KTEZ-1000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="174"/>
-        <source>QTronix Scorpius 98N+</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="175"/>
-        <source>SVEN Ergonomic 2500</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="176"/>
-        <source>SVEN Slim 303</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="177"/>
-        <source>Samsung SDM 4500P</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="178"/>
-        <source>Samsung SDM 4510P</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="179"/>
-        <source>Sanwa Supply SKB-KG3</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="180"/>
-        <source>Silvercrest Multimedia Wireless</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="181"/>
-        <source>SteelSeries Apex 300 (Apex RAW)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="182"/>
-        <source>Sun Type 6 (Japanese)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="183"/>
-        <source>Sun Type 6 USB (Japanese)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="184"/>
-        <source>Sun Type 6 USB (Unix)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="185"/>
-        <source>Sun Type 6/7 USB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="186"/>
-        <source>Sun Type 6/7 USB (European)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="187"/>
-        <source>Sun Type 7 USB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="188"/>
-        <source>Sun Type 7 USB (European)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="189"/>
-        <source>Sun Type 7 USB (Japanese)/Japanese 106-key</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="190"/>
-        <source>Sun Type 7 USB (Unix)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="191"/>
-        <source>Super Power Multimedia</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="192"/>
-        <source>Symplon PaceBook tablet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="193"/>
-        <source>Targa Visionary 811</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="194"/>
-        <source>Toshiba Satellite S3000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="195"/>
-        <source>Truly Ergonomic 227</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="196"/>
-        <source>Truly Ergonomic 229</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="197"/>
-        <source>Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="198"/>
-        <source>Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="199"/>
-        <source>Trust Direct Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="200"/>
-        <source>Trust Slimline</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="201"/>
-        <source>Trust Wireless Classic</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="202"/>
-        <source>TypeMatrix EZ-Reach 2020</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="203"/>
-        <source>TypeMatrix EZ-Reach 2030 PS2</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="204"/>
-        <source>TypeMatrix EZ-Reach 2030 USB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="205"/>
-        <source>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="206"/>
-        <source>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="207"/>
-        <source>Unitek KB-1925</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="208"/>
-        <source>ViewSonic KU-306 Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="209"/>
-        <source>Winbook Model XP5</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="210"/>
-        <source>Yahoo! Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="211"/>
-        <source>eMachines m6800 laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="222"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="229"/>
         <source>Afghani</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="223"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="230"/>
         <source>Albanian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="224"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="231"/>
         <source>Amharic</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="225"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="232"/>
         <source>Arabic</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="226"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="233"/>
         <source>Arabic (Morocco)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="227"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="234"/>
         <source>Arabic (Syria)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="228"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="235"/>
         <source>Armenian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="229"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="236"/>
         <source>Azerbaijani</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="230"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="237"/>
         <source>Bambara</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="231"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="238"/>
         <source>Bangla</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="232"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="239"/>
         <source>Belarusian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="233"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="240"/>
         <source>Belgian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="234"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="241"/>
         <source>Bosnian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="235"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="242"/>
         <source>Braille</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="236"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="243"/>
         <source>Bulgarian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="237"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="244"/>
         <source>Burmese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="238"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="245"/>
         <source>Chinese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="239"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="246"/>
         <source>Croatian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="240"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="247"/>
         <source>Czech</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="241"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="248"/>
         <source>Danish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="242"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="249"/>
         <source>Dhivehi</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="243"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="250"/>
         <source>Dutch</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="244"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="251"/>
         <source>Dzongkha</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="245"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="252"/>
         <source>English (Australian)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="246"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="253"/>
         <source>English (Cameroon)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="247"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="254"/>
         <source>English (Ghana)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="248"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="255"/>
         <source>English (Nigeria)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="249"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="256"/>
         <source>English (South Africa)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="250"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="257"/>
         <source>English (UK)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="251"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="258"/>
         <source>English (US)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="252"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="259"/>
         <source>Esperanto</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="253"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="260"/>
         <source>Estonian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="254"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="261"/>
         <source>Faroese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="255"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="262"/>
         <source>Filipino</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="256"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="263"/>
         <source>Finnish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="257"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="264"/>
         <source>French</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="258"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="265"/>
         <source>French (Canada)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="259"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="266"/>
         <source>French (Democratic Republic of the Congo)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="260"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="267"/>
         <source>French (Guinea)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="261"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="268"/>
         <source>French (Togo)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="262"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="269"/>
         <source>Georgian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="263"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="270"/>
         <source>German</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="264"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="271"/>
         <source>German (Austria)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="265"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="272"/>
         <source>German (Switzerland)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="266"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="273"/>
         <source>Greek</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="267"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="274"/>
         <source>Hebrew</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="268"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="275"/>
         <source>Hungarian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="269"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="276"/>
         <source>Icelandic</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="270"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="277"/>
         <source>Indian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="271"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="278"/>
         <source>Indonesian (Arab Melayu, phonetic)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="272"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="279"/>
         <source>Indonesian (Javanese)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="273"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="280"/>
         <source>Iraqi</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="274"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="281"/>
         <source>Irish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="275"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="282"/>
         <source>Italian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="276"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="283"/>
         <source>Japanese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="277"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="284"/>
         <source>Japanese (PC-98)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="278"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="285"/>
         <source>Kabylian (azerty layout, no dead keys)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="279"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="286"/>
         <source>Kazakh</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="280"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="287"/>
         <source>Khmer (Cambodia)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="281"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="288"/>
         <source>Korean</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="282"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="289"/>
         <source>Kyrgyz</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="283"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="290"/>
         <source>Lao</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="284"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="291"/>
         <source>Latvian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="285"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="292"/>
         <source>Lithuanian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="286"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="293"/>
         <source>Macedonian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="287"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="294"/>
         <source>Malay (Jawi, Arabic Keyboard)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="288"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="295"/>
         <source>Maltese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="289"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="296"/>
         <source>Maori</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="290"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="297"/>
         <source>Moldavian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="291"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="298"/>
         <source>Mongolian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="292"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="299"/>
         <source>Montenegrin</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="293"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="300"/>
         <source>Nepali</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="294"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="301"/>
         <source>Norwegian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="295"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="302"/>
         <source>Persian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="296"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="303"/>
         <source>Polish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="297"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="304"/>
         <source>Portuguese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="298"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="305"/>
         <source>Portuguese (Brazil)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="299"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="306"/>
         <source>Romanian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="300"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="307"/>
         <source>Russian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="301"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="308"/>
         <source>Serbian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="302"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="309"/>
         <source>Sinhala (phonetic)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="303"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="310"/>
         <source>Slovak</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="304"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="311"/>
         <source>Slovenian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="305"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="312"/>
         <source>Spanish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="306"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="313"/>
         <source>Spanish (Latin American)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="307"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="314"/>
         <source>Swahili (Kenya)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="308"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="315"/>
         <source>Swahili (Tanzania)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="309"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="316"/>
         <source>Swedish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="310"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="317"/>
         <source>Taiwanese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="311"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="318"/>
         <source>Tajik</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="312"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="319"/>
         <source>Thai</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="313"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="320"/>
         <source>Tswana</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="314"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="321"/>
         <source>Turkish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="315"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="322"/>
         <source>Turkmen</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="316"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="323"/>
         <source>Ukrainian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="317"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="324"/>
         <source>Urdu (Pakistan)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="318"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="325"/>
         <source>Uzbek</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="319"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="326"/>
         <source>Vietnamese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="320"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="327"/>
         <source>Wolof</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>kb_models</name>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="331"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="25"/>
+        <source>A4Tech KB-21</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="26"/>
+        <source>A4Tech KBS-8</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="27"/>
+        <source>A4Tech Wireless Desktop RFKB-23</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="28"/>
+        <source>Acer AirKey V</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="29"/>
+        <source>Acer C300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="30"/>
+        <source>Acer Ferrari 4000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="31"/>
+        <source>Acer laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="32"/>
+        <source>Advance Scorpius KI</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="33"/>
+        <source>Apple</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="34"/>
+        <source>Apple Aluminium (ANSI)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="35"/>
+        <source>Apple Aluminium (ISO)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="36"/>
+        <source>Apple Aluminium (JIS)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="37"/>
+        <source>Apple laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="38"/>
+        <source>Asus laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="39"/>
+        <source>Azona RF2300 wireless Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="40"/>
+        <source>BTC 5090</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="41"/>
+        <source>BTC 5113RF Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="42"/>
+        <source>BTC 5126T</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="43"/>
+        <source>BTC 6301URF</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="44"/>
+        <source>BTC 9000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="45"/>
+        <source>BTC 9000A</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="46"/>
+        <source>BTC 9001AH</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="47"/>
+        <source>BTC 9019U</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="48"/>
+        <source>BTC 9116U Mini Wireless Internet and Gaming</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="49"/>
+        <source>BenQ X-Touch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="50"/>
+        <source>BenQ X-Touch 730</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="51"/>
+        <source>BenQ X-Touch 800</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="52"/>
+        <source>Brother Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="53"/>
+        <source>Cherry B.UNLIMITED</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="54"/>
+        <source>Cherry Blue Line CyBo@rd</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="55"/>
+        <source>Cherry Blue Line CyBo@rd (alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="56"/>
+        <source>Cherry CyBo@rd USB-Hub</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="57"/>
+        <source>Cherry CyMotion Expert</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="58"/>
+        <source>Cherry CyMotion Master Linux</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="59"/>
+        <source>Cherry CyMotion Master XPress</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="60"/>
+        <source>Chicony Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="61"/>
+        <source>Chicony KB-9885</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="62"/>
+        <source>Chicony KU-0108</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="63"/>
+        <source>Chicony KU-0420</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="64"/>
+        <source>Chromebook</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="65"/>
+        <source>Classmate PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="66"/>
+        <source>Compaq Armada laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="67"/>
+        <source>Compaq Easy Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="68"/>
+        <source>Compaq Internet (13 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="69"/>
+        <source>Compaq Internet (18 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="70"/>
+        <source>Compaq Internet (7 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="71"/>
+        <source>Compaq Presario laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="72"/>
+        <source>Compaq iPaq</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="73"/>
+        <source>Creative Desktop Wireless 7000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="74"/>
+        <source>DTK2000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="75"/>
+        <source>Dell</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="76"/>
+        <source>Dell 101-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="77"/>
+        <source>Dell Inspiron 6000/8000 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="78"/>
+        <source>Dell Latitude laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="79"/>
+        <source>Dell Precision M laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="80"/>
+        <source>Dell Precision M65 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="81"/>
+        <source>Dell SK-8125</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="82"/>
+        <source>Dell SK-8135</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="83"/>
+        <source>Dell USB Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="84"/>
+        <source>Dexxa Wireless Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="85"/>
+        <source>Diamond 9801/9802</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="86"/>
+        <source>Ennyah DKB-1008</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="87"/>
+        <source>Everex STEPnote</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="88"/>
+        <source>FL90</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="89"/>
+        <source>Fujitsu-Siemens Amilo laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="90"/>
+        <source>Generic 101-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="91"/>
+        <source>Generic 102-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="92"/>
+        <source>Generic 104-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="93"/>
+        <source>Generic 104-key PC with L-shaped Enter key</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="94"/>
+        <source>Generic 105-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="95"/>
+        <source>Generic 86-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="96"/>
+        <source>Genius Comfy KB-12e</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="97"/>
+        <source>Genius Comfy KB-16M/Multimedia KWD-910</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="98"/>
+        <source>Genius Comfy KB-21e-Scroll</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="99"/>
+        <source>Genius KB-19e NB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="100"/>
+        <source>Genius KKB-2050HS</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="101"/>
+        <source>Gyration</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="102"/>
+        <source>Happy Hacking</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="103"/>
+        <source>Happy Hacking for Mac</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="104"/>
+        <source>Hewlett-Packard Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="105"/>
+        <source>Hewlett-Packard Mini 110 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="106"/>
+        <source>Hewlett-Packard NEC SK-2500 Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="107"/>
+        <source>Hewlett-Packard Omnibook 500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="108"/>
+        <source>Hewlett-Packard Omnibook 500 FA</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="109"/>
+        <source>Hewlett-Packard Omnibook 6000/6100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="110"/>
+        <source>Hewlett-Packard Omnibook XE3 GC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="111"/>
+        <source>Hewlett-Packard Omnibook XE3 GF</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="112"/>
+        <source>Hewlett-Packard Omnibook XT1000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="113"/>
+        <source>Hewlett-Packard Pavilion ZT1100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="114"/>
+        <source>Hewlett-Packard Pavilion dv5</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="115"/>
+        <source>Hewlett-Packard nx9020</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="116"/>
+        <source>Honeywell Euroboard</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="117"/>
+        <source>IBM Rapid Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="118"/>
+        <source>IBM Rapid Access II</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="119"/>
+        <source>IBM Space Saver</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="120"/>
+        <source>IBM ThinkPad 560Z/600/600E/A22E</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="121"/>
+        <source>IBM ThinkPad R60/T60/R61/T61</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="122"/>
+        <source>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="123"/>
+        <source>Keytronic FlexPro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="124"/>
+        <source>Kinesis</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="125"/>
+        <source>Logitech</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="126"/>
+        <source>Logitech Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="127"/>
+        <source>Logitech Cordless Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="128"/>
+        <source>Logitech Cordless Desktop (alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="129"/>
+        <source>Logitech Cordless Desktop EX110</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="130"/>
+        <source>Logitech Cordless Desktop LX-300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="131"/>
+        <source>Logitech Cordless Desktop Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="132"/>
+        <source>Logitech Cordless Desktop Optical</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="133"/>
+        <source>Logitech Cordless Desktop Pro (2nd alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="134"/>
+        <source>Logitech Cordless Desktop iTouch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="135"/>
+        <source>Logitech Cordless Freedom/Desktop Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="136"/>
+        <source>Logitech G15 extra keys via G15daemon</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="137"/>
+        <source>Logitech Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="138"/>
+        <source>Logitech Internet 350</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="139"/>
+        <source>Logitech Internet Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="140"/>
+        <source>Logitech Ultra-X</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="141"/>
+        <source>Logitech Ultra-X Cordless Media Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="142"/>
+        <source>Logitech diNovo</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="143"/>
+        <source>Logitech diNovo Edge</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="144"/>
+        <source>Logitech iTouch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="145"/>
+        <source>Logitech iTouch Cordless Y-RB6</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="146"/>
+        <source>Logitech iTouch Internet Navigator SE</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="147"/>
+        <source>Logitech iTouch Internet Navigator SE USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="148"/>
+        <source>MacBook/MacBook Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="149"/>
+        <source>MacBook/MacBook Pro (intl.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="150"/>
+        <source>Macintosh</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="151"/>
+        <source>Macintosh Old</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="152"/>
+        <source>Memorex MX1998</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="153"/>
+        <source>Memorex MX2500 EZ-Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="154"/>
+        <source>Memorex MX2750</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="155"/>
+        <source>Microsoft Comfort Curve 2000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="156"/>
+        <source>Microsoft Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="157"/>
+        <source>Microsoft Internet Pro (Swedish)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="158"/>
+        <source>Microsoft Natural</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="159"/>
+        <source>Microsoft Natural Elite</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="160"/>
+        <source>Microsoft Natural Ergonomic 4000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="161"/>
+        <source>Microsoft Natural Pro OEM</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="162"/>
+        <source>Microsoft Natural Pro USB/Internet Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="163"/>
+        <source>Microsoft Natural Pro/Internet Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="164"/>
+        <source>Microsoft Natural Wireless Ergonomic 7000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="165"/>
+        <source>Microsoft Office Keyboard</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="166"/>
+        <source>Microsoft Surface</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="167"/>
+        <source>Microsoft Wireless Multimedia 1.0A</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="168"/>
+        <source>NEC SK-1300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="169"/>
+        <source>NEC SK-2500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="170"/>
+        <source>NEC SK-6200</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="171"/>
+        <source>NEC SK-7100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="172"/>
+        <source>Northgate OmniKey 101</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="173"/>
+        <source>OLPC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="174"/>
+        <source>Ortek Multimedia/Internet MCK-800</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="175"/>
+        <source>PC-98</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="176"/>
+        <source>Propeller Voyager KTEZ-1000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="177"/>
+        <source>QTronix Scorpius 98N+</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="178"/>
+        <source>SVEN Ergonomic 2500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="179"/>
+        <source>SVEN Slim 303</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="180"/>
+        <source>Samsung SDM 4500P</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="181"/>
+        <source>Samsung SDM 4510P</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="182"/>
+        <source>Sanwa Supply SKB-KG3</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="183"/>
+        <source>Silvercrest Multimedia Wireless</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="184"/>
+        <source>SteelSeries Apex 300 (Apex RAW)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="185"/>
+        <source>Sun Type 6 (Japanese)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="186"/>
+        <source>Sun Type 6 USB (Japanese)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="187"/>
+        <source>Sun Type 6 USB (Unix)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="188"/>
+        <source>Sun Type 6/7 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="189"/>
+        <source>Sun Type 6/7 USB (European)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="190"/>
+        <source>Sun Type 7 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="191"/>
+        <source>Sun Type 7 USB (European)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="192"/>
+        <source>Sun Type 7 USB (Japanese)/Japanese 106-key</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="193"/>
+        <source>Sun Type 7 USB (Unix)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="194"/>
+        <source>Super Power Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="195"/>
+        <source>Symplon PaceBook tablet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="196"/>
+        <source>Targa Visionary 811</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="197"/>
+        <source>Toshiba Satellite S3000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="198"/>
+        <source>Truly Ergonomic 227</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="199"/>
+        <source>Truly Ergonomic 229</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="200"/>
+        <source>Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="201"/>
+        <source>Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="202"/>
+        <source>Trust Direct Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="203"/>
+        <source>Trust Slimline</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="204"/>
+        <source>Trust Wireless Classic</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="205"/>
+        <source>TypeMatrix EZ-Reach 2020</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="206"/>
+        <source>TypeMatrix EZ-Reach 2030 PS2</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="207"/>
+        <source>TypeMatrix EZ-Reach 2030 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="208"/>
+        <source>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="209"/>
+        <source>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="210"/>
+        <source>Unitek KB-1925</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="211"/>
+        <source>ViewSonic KU-306 Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="212"/>
+        <source>Winbook Model XP5</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="213"/>
+        <source>Yahoo! Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="214"/>
+        <source>eMachines m6800 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>kb_variants</name>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="342"/>
         <source>Akan</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="332"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="343"/>
         <source>Albanian (Plisi)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="333"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="344"/>
         <source>Albanian (Veqilharxhi)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="334"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="345"/>
         <source>Arabic (AZERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="335"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="346"/>
         <source>Arabic (AZERTY, Eastern Arabic numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="336"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="347"/>
         <source>Arabic (Algeria)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="337"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="348"/>
         <source>Arabic (Buckwalter)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="338"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="349"/>
         <source>Arabic (Eastern Arabic numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="339"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="350"/>
         <source>Arabic (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="340"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="351"/>
         <source>Arabic (OLPC)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="341"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="352"/>
         <source>Arabic (Pakistan)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="342"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="353"/>
         <source>Arabic (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="343"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="354"/>
         <source>Arabic (QWERTY, Eastern Arabic numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="344"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="355"/>
         <source>Armenian (alt. eastern)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="345"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="356"/>
         <source>Armenian (alt. phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="346"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="357"/>
         <source>Armenian (eastern)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="347"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="358"/>
         <source>Armenian (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="348"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="359"/>
         <source>Armenian (western)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="349"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="360"/>
         <source>Asturian (Spain, with bottom-dot H and L)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="350"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="361"/>
         <source>Avatime</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="351"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="362"/>
         <source>Azerbaijani (Cyrillic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="352"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="363"/>
         <source>Bangla (India)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="353"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="364"/>
         <source>Bangla (India, Baishakhi Inscript)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="354"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="365"/>
         <source>Bangla (India, Baishakhi)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="355"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="366"/>
         <source>Bangla (India, Bornona)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="356"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="367"/>
         <source>Bangla (India, Gitanjali)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="357"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="368"/>
         <source>Bangla (India, Probhat)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="358"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="369"/>
         <source>Bangla (Probhat)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="359"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="370"/>
         <source>Bashkirian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="360"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="371"/>
         <source>Belarusian (Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="361"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="372"/>
         <source>Belarusian (intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="362"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="373"/>
         <source>Belarusian (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="363"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="374"/>
         <source>Belgian (ISO, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="364"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="375"/>
         <source>Belgian (Latin-9 only, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="365"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="376"/>
         <source>Belgian (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="366"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="377"/>
         <source>Belgian (Sun dead keys, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="367"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="378"/>
         <source>Belgian (Wang 724 AZERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="368"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="379"/>
         <source>Belgian (alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="369"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="380"/>
         <source>Belgian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="370"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="381"/>
         <source>Berber (Morocco, Tifinagh alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="371"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="382"/>
         <source>Berber (Morocco, Tifinagh extended phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="372"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="383"/>
         <source>Berber (Morocco, Tifinagh extended)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="373"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="384"/>
         <source>Berber (Morocco, Tifinagh phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="374"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="385"/>
         <source>Berber (Morocco, Tifinagh phonetic, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="375"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="386"/>
         <source>Berber (Morocco, Tifinagh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="376"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="387"/>
         <source>Bosnian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="377"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="388"/>
         <source>Bosnian (US, with Bosnian digraphs)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="378"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="389"/>
         <source>Bosnian (with Bosnian digraphs)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="379"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="390"/>
         <source>Bosnian (with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="380"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="391"/>
         <source>Braille (left-handed inverted thumb)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="381"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="392"/>
         <source>Braille (left-handed)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="382"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="393"/>
         <source>Braille (right-handed inverted thumb)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="383"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="394"/>
         <source>Braille (right-handed)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="384"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="395"/>
         <source>Bulgarian (enhanced)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="385"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="396"/>
         <source>Bulgarian (new phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="386"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="397"/>
         <source>Bulgarian (traditional phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="387"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="398"/>
         <source>Burmese Zawgyi</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="388"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="399"/>
         <source>Cameroon (AZERTY, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="389"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="400"/>
         <source>Cameroon (Dvorak, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="390"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="401"/>
         <source>Cameroon Multilingual (QWERTY, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="391"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="402"/>
         <source>Canadian (intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="392"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="403"/>
         <source>Canadian (intl., 1st part)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="393"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="404"/>
         <source>Canadian (intl., 2nd part)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="394"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="405"/>
         <source>Catalan (Spain, with middle-dot L)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="395"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="406"/>
         <source>Cherokee</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="396"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="407"/>
         <source>Chuvash</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="397"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="408"/>
         <source>Chuvash (Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="398"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="409"/>
         <source>CloGaelach</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="399"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="410"/>
         <source>Crimean Tatar (Turkish Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="400"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="411"/>
         <source>Crimean Tatar (Turkish F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="401"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="412"/>
         <source>Crimean Tatar (Turkish Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="402"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="413"/>
         <source>Croatian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="403"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="414"/>
         <source>Croatian (US, with Croatian digraphs)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="404"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="415"/>
         <source>Croatian (with Croatian digraphs)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="405"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="416"/>
         <source>Croatian (with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="406"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="417"/>
         <source>Czech (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="407"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="418"/>
         <source>Czech (QWERTY, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="408"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="419"/>
         <source>Czech (QWERTY, extended backslash)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="409"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="420"/>
         <source>Czech (UCW, only accented letters)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="410"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="421"/>
         <source>Czech (US, Dvorak, UCW support)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="411"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="422"/>
         <source>Czech (with &amp;lt;|&amp;gt; key)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="412"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="423"/>
         <source>Danish (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="413"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="424"/>
         <source>Danish (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="414"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="425"/>
         <source>Danish (Macintosh, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="415"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="426"/>
         <source>Danish (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="416"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="427"/>
         <source>Danish (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="417"/>
-        <source>Dutch (Macintosh)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="418"/>
-        <source>Dutch (Sun dead keys)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="419"/>
-        <source>Dutch (standard)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="420"/>
-        <source>English (Canada)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="421"/>
-        <source>English (Colemak)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="422"/>
-        <source>English (Dvorak)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="423"/>
-        <source>English (Dvorak, alt. intl.)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="424"/>
-        <source>English (Dvorak, intl., with dead keys)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="425"/>
-        <source>English (Dvorak, left-handed)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="426"/>
-        <source>English (Dvorak, right-handed)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="427"/>
-        <source>English (Ghana, GILLBT)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="428"/>
-        <source>English (Ghana, multilingual)</source>
+        <source>Default</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="429"/>
-        <source>English (India, with rupee)</source>
+        <source>Dutch (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="430"/>
-        <source>English (Macintosh)</source>
+        <source>Dutch (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="431"/>
-        <source>English (Mali, US, Macintosh)</source>
+        <source>Dutch (standard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="432"/>
-        <source>English (Mali, US, intl.)</source>
+        <source>English (Canada)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="433"/>
-        <source>English (Norman)</source>
+        <source>English (Colemak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="434"/>
-        <source>English (UK, Colemak)</source>
+        <source>English (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="435"/>
-        <source>English (UK, Dvorak)</source>
+        <source>English (Dvorak, alt. intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="436"/>
-        <source>English (UK, Dvorak, with UK punctuation)</source>
+        <source>English (Dvorak, intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="437"/>
-        <source>English (UK, Macintosh)</source>
+        <source>English (Dvorak, left-handed)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="438"/>
-        <source>English (UK, Macintosh, intl.)</source>
+        <source>English (Dvorak, right-handed)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="439"/>
-        <source>English (UK, extended, Windows)</source>
+        <source>English (Ghana, GILLBT)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="440"/>
-        <source>English (UK, intl., with dead keys)</source>
+        <source>English (Ghana, multilingual)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="441"/>
-        <source>English (US, Symbolic)</source>
+        <source>English (India, with rupee)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="442"/>
-        <source>English (US, alt. intl.)</source>
+        <source>English (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="443"/>
-        <source>English (US, euro on 5)</source>
+        <source>English (Mali, US, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="444"/>
-        <source>English (US, intl., with dead keys)</source>
+        <source>English (Mali, US, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="445"/>
-        <source>English (Workman)</source>
+        <source>English (Norman)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="446"/>
-        <source>English (Workman, intl., with dead keys)</source>
+        <source>English (UK, Colemak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="447"/>
-        <source>English (classic Dvorak)</source>
+        <source>English (UK, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="448"/>
-        <source>English (intl., with AltGr dead keys)</source>
+        <source>English (UK, Dvorak, with UK punctuation)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="449"/>
-        <source>English (programmer Dvorak)</source>
+        <source>English (UK, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="450"/>
-        <source>English (the divide/multiply toggle the layout)</source>
+        <source>English (UK, Macintosh, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="451"/>
-        <source>Esperanto (Brazil, Nativo)</source>
+        <source>English (UK, extended, Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="452"/>
-        <source>Esperanto (Portugal, Nativo)</source>
+        <source>English (UK, intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="453"/>
-        <source>Esperanto (legacy)</source>
+        <source>English (US, Symbolic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="454"/>
-        <source>Estonian (Dvorak)</source>
+        <source>English (US, alt. intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="455"/>
-        <source>Estonian (US)</source>
+        <source>English (US, euro on 5)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="456"/>
-        <source>Estonian (no dead keys)</source>
+        <source>English (US, intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="457"/>
-        <source>Ewe</source>
+        <source>English (Workman)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="458"/>
-        <source>Faroese (no dead keys)</source>
+        <source>English (Workman, intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="459"/>
-        <source>Filipino (Capewell-Dvorak, Baybayin)</source>
+        <source>English (classic Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="460"/>
-        <source>Filipino (Capewell-Dvorak, Latin)</source>
+        <source>English (intl., with AltGr dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="461"/>
-        <source>Filipino (Capewell-QWERF 2006, Baybayin)</source>
+        <source>English (programmer Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="462"/>
-        <source>Filipino (Capewell-QWERF 2006, Latin)</source>
+        <source>English (the divide/multiply toggle the layout)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="463"/>
-        <source>Filipino (Colemak, Baybayin)</source>
+        <source>Esperanto (Brazil, Nativo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="464"/>
-        <source>Filipino (Colemak, Latin)</source>
+        <source>Esperanto (Portugal, Nativo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="465"/>
-        <source>Filipino (Dvorak, Baybayin)</source>
+        <source>Esperanto (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="466"/>
-        <source>Filipino (Dvorak, Latin)</source>
+        <source>Estonian (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="467"/>
-        <source>Filipino (QWERTY, Baybayin)</source>
+        <source>Estonian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="468"/>
-        <source>Finnish (Macintosh)</source>
+        <source>Estonian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="469"/>
-        <source>Finnish (Windows)</source>
+        <source>Ewe</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="470"/>
-        <source>Finnish (classic)</source>
+        <source>Faroese (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="471"/>
-        <source>Finnish (classic, no dead keys)</source>
+        <source>Filipino (Capewell-Dvorak, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="472"/>
-        <source>French (AZERTY)</source>
+        <source>Filipino (Capewell-Dvorak, Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="473"/>
-        <source>French (AZERTY, AFNOR)</source>
+        <source>Filipino (Capewell-QWERF 2006, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="474"/>
-        <source>French (BEPO)</source>
+        <source>Filipino (Capewell-QWERF 2006, Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="475"/>
-        <source>French (BEPO, AFNOR)</source>
+        <source>Filipino (Colemak, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="476"/>
-        <source>French (BEPO, Latin-9 only)</source>
+        <source>Filipino (Colemak, Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="477"/>
-        <source>French (Breton)</source>
+        <source>Filipino (Dvorak, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="478"/>
-        <source>French (Cameroon)</source>
+        <source>Filipino (Dvorak, Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="479"/>
-        <source>French (Canada, Dvorak)</source>
+        <source>Filipino (QWERTY, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="480"/>
-        <source>French (Canada, legacy)</source>
+        <source>Finnish (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="481"/>
-        <source>French (Dvorak)</source>
+        <source>Finnish (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="482"/>
-        <source>French (Macintosh)</source>
+        <source>Finnish (classic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="483"/>
-        <source>French (Mali, alt.)</source>
+        <source>Finnish (classic, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="484"/>
-        <source>French (Morocco)</source>
+        <source>French (AZERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="485"/>
-        <source>French (Sun dead keys)</source>
+        <source>French (AZERTY, AFNOR)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="486"/>
-        <source>French (Switzerland)</source>
+        <source>French (BEPO)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="487"/>
-        <source>French (Switzerland, Macintosh)</source>
+        <source>French (BEPO, AFNOR)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="488"/>
-        <source>French (Switzerland, Sun dead keys)</source>
+        <source>French (BEPO, Latin-9 only)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="489"/>
-        <source>French (Switzerland, no dead keys)</source>
+        <source>French (Breton)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="490"/>
-        <source>French (US)</source>
+        <source>French (Cameroon)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="491"/>
-        <source>French (alt.)</source>
+        <source>French (Canada, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="492"/>
-        <source>French (alt., Latin-9 only)</source>
+        <source>French (Canada, legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="493"/>
-        <source>French (alt., Sun dead keys)</source>
+        <source>French (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="494"/>
-        <source>French (alt., no dead keys)</source>
+        <source>French (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="495"/>
-        <source>French (legacy, alt.)</source>
+        <source>French (Mali, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="496"/>
-        <source>French (legacy, alt., Sun dead keys)</source>
+        <source>French (Morocco)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="497"/>
-        <source>French (legacy, alt., no dead keys)</source>
+        <source>French (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="498"/>
-        <source>French (no dead keys)</source>
+        <source>French (Switzerland)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="499"/>
-        <source>Friulian (Italy)</source>
+        <source>French (Switzerland, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="500"/>
-        <source>Fula</source>
+        <source>French (Switzerland, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="501"/>
-        <source>Ga</source>
+        <source>French (Switzerland, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="502"/>
-        <source>Georgian (France, AZERTY Tskapo)</source>
+        <source>French (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="503"/>
-        <source>Georgian (Italy)</source>
+        <source>French (alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="504"/>
-        <source>Georgian (MESS)</source>
+        <source>French (alt., Latin-9 only)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="505"/>
-        <source>Georgian (ergonomic)</source>
+        <source>French (alt., Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="506"/>
-        <source>German (Austria, Macintosh)</source>
+        <source>French (alt., no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="507"/>
-        <source>German (Austria, Sun dead keys)</source>
+        <source>French (legacy, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="508"/>
-        <source>German (Austria, no dead keys)</source>
+        <source>French (legacy, alt., Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="509"/>
-        <source>German (Dvorak)</source>
+        <source>French (legacy, alt., no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="510"/>
-        <source>German (E1)</source>
+        <source>French (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="511"/>
-        <source>German (E2)</source>
+        <source>Friulian (Italy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="512"/>
-        <source>German (Macintosh)</source>
+        <source>Fula</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="513"/>
-        <source>German (Macintosh, no dead keys)</source>
+        <source>Ga</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="514"/>
-        <source>German (Neo 2)</source>
+        <source>Georgian (France, AZERTY Tskapo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="515"/>
-        <source>German (QWERTY)</source>
+        <source>Georgian (Italy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="516"/>
-        <source>German (Sun dead keys)</source>
+        <source>Georgian (MESS)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="517"/>
-        <source>German (Switzerland, Macintosh)</source>
+        <source>Georgian (ergonomic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="518"/>
-        <source>German (Switzerland, Sun dead keys)</source>
+        <source>German (Austria, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="519"/>
-        <source>German (Switzerland, legacy)</source>
+        <source>German (Austria, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="520"/>
-        <source>German (Switzerland, no dead keys)</source>
+        <source>German (Austria, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="521"/>
-        <source>German (T3)</source>
+        <source>German (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="522"/>
-        <source>German (US)</source>
+        <source>German (E1)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="523"/>
-        <source>German (dead acute)</source>
+        <source>German (E2)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="524"/>
-        <source>German (dead grave acute)</source>
+        <source>German (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="525"/>
-        <source>German (dead tilde)</source>
+        <source>German (Macintosh, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="526"/>
-        <source>German (no dead keys)</source>
+        <source>German (Neo 2)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="527"/>
-        <source>Greek (extended)</source>
+        <source>German (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="528"/>
-        <source>Greek (no dead keys)</source>
+        <source>German (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="529"/>
-        <source>Greek (polytonic)</source>
+        <source>German (Switzerland, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="530"/>
-        <source>Greek (simple)</source>
+        <source>German (Switzerland, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="531"/>
-        <source>Gujarati</source>
+        <source>German (Switzerland, legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="532"/>
-        <source>Hanyu Pinyin (with AltGr dead keys)</source>
+        <source>German (Switzerland, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="533"/>
-        <source>Hausa (Ghana)</source>
+        <source>German (T3)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="534"/>
-        <source>Hausa (Nigeria)</source>
+        <source>German (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="535"/>
-        <source>Hawaiian</source>
+        <source>German (dead acute)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="536"/>
-        <source>Hebrew (Biblical, Tiro)</source>
+        <source>German (dead grave acute)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="537"/>
-        <source>Hebrew (lyx)</source>
+        <source>German (dead tilde)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="538"/>
-        <source>Hebrew (phonetic)</source>
+        <source>German (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="539"/>
-        <source>Hindi (Bolnagri)</source>
+        <source>Greek (extended)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="540"/>
-        <source>Hindi (KaGaPa, phonetic)</source>
+        <source>Greek (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="541"/>
-        <source>Hindi (Wx)</source>
+        <source>Greek (polytonic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="542"/>
-        <source>Hungarian (QWERTY)</source>
+        <source>Greek (simple)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="543"/>
-        <source>Hungarian (QWERTY, 101-key, comma, dead keys)</source>
+        <source>Gujarati</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="544"/>
-        <source>Hungarian (QWERTY, 101-key, comma, no dead keys)</source>
+        <source>Hanyu Pinyin (with AltGr dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="545"/>
-        <source>Hungarian (QWERTY, 101-key, dot, dead keys)</source>
+        <source>Hausa (Ghana)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="546"/>
-        <source>Hungarian (QWERTY, 101-key, dot, no dead keys)</source>
+        <source>Hausa (Nigeria)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="547"/>
-        <source>Hungarian (QWERTY, 102-key, comma, dead keys)</source>
+        <source>Hawaiian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="548"/>
-        <source>Hungarian (QWERTY, 102-key, comma, no dead keys)</source>
+        <source>Hebrew (Biblical, Tiro)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="549"/>
-        <source>Hungarian (QWERTY, 102-key, dot, dead keys)</source>
+        <source>Hebrew (lyx)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="550"/>
-        <source>Hungarian (QWERTY, 102-key, dot, no dead keys)</source>
+        <source>Hebrew (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="551"/>
-        <source>Hungarian (QWERTZ, 101-key, comma, dead keys)</source>
+        <source>Hindi (Bolnagri)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="552"/>
-        <source>Hungarian (QWERTZ, 101-key, comma, no dead keys)</source>
+        <source>Hindi (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="553"/>
-        <source>Hungarian (QWERTZ, 101-key, dot, dead keys)</source>
+        <source>Hindi (Wx)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="554"/>
-        <source>Hungarian (QWERTZ, 101-key, dot, no dead keys)</source>
+        <source>Hungarian (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="555"/>
-        <source>Hungarian (QWERTZ, 102-key, comma, dead keys)</source>
+        <source>Hungarian (QWERTY, 101-key, comma, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="556"/>
-        <source>Hungarian (QWERTZ, 102-key, comma, no dead keys)</source>
+        <source>Hungarian (QWERTY, 101-key, comma, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="557"/>
-        <source>Hungarian (QWERTZ, 102-key, dot, dead keys)</source>
+        <source>Hungarian (QWERTY, 101-key, dot, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="558"/>
-        <source>Hungarian (QWERTZ, 102-key, dot, no dead keys)</source>
+        <source>Hungarian (QWERTY, 101-key, dot, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="559"/>
-        <source>Hungarian (no dead keys)</source>
+        <source>Hungarian (QWERTY, 102-key, comma, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="560"/>
-        <source>Hungarian (standard)</source>
+        <source>Hungarian (QWERTY, 102-key, comma, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="561"/>
-        <source>Icelandic (Dvorak)</source>
+        <source>Hungarian (QWERTY, 102-key, dot, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="562"/>
-        <source>Icelandic (Macintosh)</source>
+        <source>Hungarian (QWERTY, 102-key, dot, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="563"/>
-        <source>Icelandic (Macintosh, legacy)</source>
+        <source>Hungarian (QWERTZ, 101-key, comma, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="564"/>
-        <source>Icelandic (Sun dead keys)</source>
+        <source>Hungarian (QWERTZ, 101-key, comma, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="565"/>
-        <source>Icelandic (no dead keys)</source>
+        <source>Hungarian (QWERTZ, 101-key, dot, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="566"/>
-        <source>Igbo</source>
+        <source>Hungarian (QWERTZ, 101-key, dot, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="567"/>
-        <source>Indic (phonetic, IPA)</source>
+        <source>Hungarian (QWERTZ, 102-key, comma, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="568"/>
-        <source>Indonesian (Arab Melayu, extended phonetic)</source>
+        <source>Hungarian (QWERTZ, 102-key, comma, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="569"/>
-        <source>Inuktitut</source>
+        <source>Hungarian (QWERTZ, 102-key, dot, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="570"/>
-        <source>Irish (UnicodeExpert)</source>
+        <source>Hungarian (QWERTZ, 102-key, dot, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="571"/>
-        <source>Italian (IBM 142)</source>
+        <source>Hungarian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="572"/>
-        <source>Italian (Macintosh)</source>
+        <source>Hungarian (standard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="573"/>
-        <source>Italian (US)</source>
+        <source>Icelandic (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="574"/>
-        <source>Italian (Windows)</source>
+        <source>Icelandic (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="575"/>
-        <source>Italian (intl., with dead keys)</source>
+        <source>Icelandic (Macintosh, legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="576"/>
-        <source>Italian (no dead keys)</source>
+        <source>Icelandic (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="577"/>
-        <source>Japanese (Dvorak)</source>
+        <source>Icelandic (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="578"/>
-        <source>Japanese (Kana 86)</source>
+        <source>Igbo</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="579"/>
-        <source>Japanese (Kana)</source>
+        <source>Indic (phonetic, IPA)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="580"/>
-        <source>Japanese (Macintosh)</source>
+        <source>Indonesian (Arab Melayu, extended phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="581"/>
-        <source>Japanese (OADG 109A)</source>
+        <source>Inuktitut</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="582"/>
-        <source>Kabylian (Algeria, Tifinagh)</source>
+        <source>Irish (UnicodeExpert)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="583"/>
-        <source>Kabylian (azerty layout, with dead keys)</source>
+        <source>Italian (IBM 142)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="584"/>
-        <source>Kabylian (qwerty-gb layout, with dead keys)</source>
+        <source>Italian (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="585"/>
-        <source>Kabylian (qwerty-us layout, with dead keys)</source>
+        <source>Italian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="586"/>
-        <source>Kalmyk</source>
+        <source>Italian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="587"/>
-        <source>Kannada</source>
+        <source>Italian (intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="588"/>
-        <source>Kannada (KaGaPa, phonetic)</source>
+        <source>Italian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="589"/>
-        <source>Kashubian</source>
+        <source>Japanese (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="590"/>
-        <source>Kazakh (Latin)</source>
+        <source>Japanese (Kana 86)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="591"/>
-        <source>Kazakh (extended)</source>
+        <source>Japanese (Kana)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="592"/>
-        <source>Kazakh (with Russian)</source>
+        <source>Japanese (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="593"/>
-        <source>Kikuyu</source>
+        <source>Japanese (OADG 109A)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="594"/>
-        <source>Komi</source>
+        <source>Kabylian (Algeria, Tifinagh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="595"/>
-        <source>Korean (101/104-key compatible)</source>
+        <source>Kabylian (azerty layout, with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="596"/>
-        <source>Kurdish (Iran, Arabic-Latin)</source>
+        <source>Kabylian (qwerty-gb layout, with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="597"/>
-        <source>Kurdish (Iran, F)</source>
+        <source>Kabylian (qwerty-us layout, with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="598"/>
-        <source>Kurdish (Iran, Latin Alt-Q)</source>
+        <source>Kalmyk</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="599"/>
-        <source>Kurdish (Iran, Latin Q)</source>
+        <source>Kannada</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="600"/>
-        <source>Kurdish (Iraq, Arabic-Latin)</source>
+        <source>Kannada (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="601"/>
-        <source>Kurdish (Iraq, F)</source>
+        <source>Kashubian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="602"/>
-        <source>Kurdish (Iraq, Latin Alt-Q)</source>
+        <source>Kazakh (Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="603"/>
-        <source>Kurdish (Iraq, Latin Q)</source>
+        <source>Kazakh (extended)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="604"/>
-        <source>Kurdish (Syria, F)</source>
+        <source>Kazakh (with Russian)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="605"/>
-        <source>Kurdish (Syria, Latin Alt-Q)</source>
+        <source>Kikuyu</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="606"/>
-        <source>Kurdish (Syria, Latin Q)</source>
+        <source>Komi</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="607"/>
-        <source>Kurdish (Turkey, F)</source>
+        <source>Korean (101/104-key compatible)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="608"/>
-        <source>Kurdish (Turkey, Latin Alt-Q)</source>
+        <source>Kurdish (Iran, Arabic-Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="609"/>
-        <source>Kurdish (Turkey, Latin Q)</source>
+        <source>Kurdish (Iran, F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="610"/>
-        <source>Kyrgyz (phonetic)</source>
+        <source>Kurdish (Iran, Latin Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="611"/>
-        <source>Lao (STEA)</source>
+        <source>Kurdish (Iran, Latin Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="612"/>
-        <source>Latvian (F)</source>
+        <source>Kurdish (Iraq, Arabic-Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="613"/>
-        <source>Latvian (adapted)</source>
+        <source>Kurdish (Iraq, F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="614"/>
-        <source>Latvian (apostrophe)</source>
+        <source>Kurdish (Iraq, Latin Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="615"/>
-        <source>Latvian (ergonomic, ŪGJRMV)</source>
+        <source>Kurdish (Iraq, Latin Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="616"/>
-        <source>Latvian (modern)</source>
+        <source>Kurdish (Syria, F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="617"/>
-        <source>Latvian (tilde)</source>
+        <source>Kurdish (Syria, Latin Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="618"/>
-        <source>Lithuanian (IBM LST 1205-92)</source>
+        <source>Kurdish (Syria, Latin Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="619"/>
-        <source>Lithuanian (LEKP)</source>
+        <source>Kurdish (Turkey, F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="620"/>
-        <source>Lithuanian (LEKPa)</source>
+        <source>Kurdish (Turkey, Latin Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="621"/>
-        <source>Lithuanian (US)</source>
+        <source>Kurdish (Turkey, Latin Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="622"/>
-        <source>Lithuanian (standard)</source>
+        <source>Kyrgyz (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="623"/>
-        <source>Lower Sorbian</source>
+        <source>Lao (STEA)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="624"/>
-        <source>Lower Sorbian (QWERTZ)</source>
+        <source>Latvian (F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="625"/>
-        <source>Macedonian (no dead keys)</source>
+        <source>Latvian (adapted)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="626"/>
-        <source>Malay (Jawi, phonetic)</source>
+        <source>Latvian (apostrophe)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="627"/>
-        <source>Malayalam</source>
+        <source>Latvian (ergonomic, ŪGJRMV)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="628"/>
-        <source>Malayalam (Lalitha)</source>
+        <source>Latvian (modern)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="629"/>
-        <source>Malayalam (enhanced Inscript, with rupee)</source>
+        <source>Latvian (tilde)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="630"/>
-        <source>Maltese (UK, with AltGr overrides)</source>
+        <source>Lithuanian (IBM LST 1205-92)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="631"/>
-        <source>Maltese (US layout with AltGr overrides)</source>
+        <source>Lithuanian (LEKP)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="632"/>
-        <source>Maltese (US)</source>
+        <source>Lithuanian (LEKPa)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="633"/>
-        <source>Manipuri (Eeyek)</source>
+        <source>Lithuanian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="634"/>
-        <source>Marathi (KaGaPa, phonetic)</source>
+        <source>Lithuanian (standard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="635"/>
-        <source>Marathi (enhanced Inscript)</source>
+        <source>Lower Sorbian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="636"/>
-        <source>Mari</source>
+        <source>Lower Sorbian (QWERTZ)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="637"/>
-        <source>Mmuock</source>
+        <source>Macedonian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="638"/>
-        <source>Moldavian (Gagauz)</source>
+        <source>Malay (Jawi, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="639"/>
-        <source>Mongolian (Bichig)</source>
+        <source>Malayalam</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="640"/>
-        <source>Mongolian (Galik)</source>
+        <source>Malayalam (Lalitha)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="641"/>
-        <source>Mongolian (Manchu Galik)</source>
+        <source>Malayalam (enhanced Inscript, with rupee)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="642"/>
-        <source>Mongolian (Manchu)</source>
+        <source>Maltese (UK, with AltGr overrides)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="643"/>
-        <source>Mongolian (Todo Galik)</source>
+        <source>Maltese (US layout with AltGr overrides)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="644"/>
-        <source>Mongolian (Todo)</source>
+        <source>Maltese (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="645"/>
-        <source>Mongolian (Xibe)</source>
+        <source>Manipuri (Eeyek)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="646"/>
-        <source>Montenegrin (Cyrillic)</source>
+        <source>Marathi (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="647"/>
-        <source>Montenegrin (Cyrillic, ZE and ZHE swapped)</source>
+        <source>Marathi (enhanced Inscript)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="648"/>
-        <source>Montenegrin (Cyrillic, with guillemets)</source>
+        <source>Mari</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="649"/>
-        <source>Montenegrin (Latin, QWERTY)</source>
+        <source>Mmuock</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="650"/>
-        <source>Montenegrin (Latin, Unicode)</source>
+        <source>Moldavian (Gagauz)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="651"/>
-        <source>Montenegrin (Latin, Unicode, QWERTY)</source>
+        <source>Mongolian (Bichig)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="652"/>
-        <source>Montenegrin (Latin, with guillemets)</source>
+        <source>Mongolian (Galik)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="653"/>
-        <source>Northern Saami (Finland)</source>
+        <source>Mongolian (Manchu Galik)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="654"/>
-        <source>Northern Saami (Norway)</source>
+        <source>Mongolian (Manchu)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="655"/>
-        <source>Northern Saami (Norway, no dead keys)</source>
+        <source>Mongolian (Todo Galik)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="656"/>
-        <source>Northern Saami (Sweden)</source>
+        <source>Mongolian (Todo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="657"/>
-        <source>Norwegian (Colemak)</source>
+        <source>Mongolian (Xibe)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="658"/>
-        <source>Norwegian (Dvorak)</source>
+        <source>Montenegrin (Cyrillic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="659"/>
-        <source>Norwegian (Macintosh)</source>
+        <source>Montenegrin (Cyrillic, ZE and ZHE swapped)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="660"/>
-        <source>Norwegian (Macintosh, no dead keys)</source>
+        <source>Montenegrin (Cyrillic, with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="661"/>
-        <source>Norwegian (Windows)</source>
+        <source>Montenegrin (Latin, QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="662"/>
-        <source>Norwegian (no dead keys)</source>
+        <source>Montenegrin (Latin, Unicode)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="663"/>
-        <source>Occitan</source>
+        <source>Montenegrin (Latin, Unicode, QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="664"/>
-        <source>Ogham</source>
+        <source>Montenegrin (Latin, with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="665"/>
-        <source>Ogham (IS434)</source>
+        <source>Northern Saami (Finland)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="666"/>
-        <source>Ol Chiki</source>
+        <source>Northern Saami (Norway)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="667"/>
-        <source>Oriya</source>
+        <source>Northern Saami (Norway, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="668"/>
-        <source>Ossetian (Georgia)</source>
+        <source>Northern Saami (Sweden)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="669"/>
-        <source>Ossetian (Windows)</source>
+        <source>Norwegian (Colemak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="670"/>
-        <source>Ossetian (legacy)</source>
+        <source>Norwegian (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="671"/>
-        <source>Pannonian Rusyn</source>
+        <source>Norwegian (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="672"/>
-        <source>Pashto</source>
+        <source>Norwegian (Macintosh, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="673"/>
-        <source>Pashto (Afghanistan, OLPC)</source>
+        <source>Norwegian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="674"/>
-        <source>Persian (Afghanistan, Dari OLPC)</source>
+        <source>Norwegian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="675"/>
-        <source>Persian (with Persian keypad)</source>
+        <source>Occitan</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="676"/>
-        <source>Polish (British keyboard)</source>
+        <source>Ogham</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="677"/>
-        <source>Polish (Dvorak)</source>
+        <source>Ogham (IS434)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="678"/>
-        <source>Polish (Dvorak, with Polish quotes on key 1)</source>
+        <source>Ol Chiki</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="679"/>
-        <source>Polish (Dvorak, with Polish quotes on quotemark key)</source>
+        <source>Oriya</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="680"/>
-        <source>Polish (QWERTZ)</source>
+        <source>Ossetian (Georgia)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="681"/>
-        <source>Polish (legacy)</source>
+        <source>Ossetian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="682"/>
-        <source>Polish (programmer Dvorak)</source>
+        <source>Ossetian (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="683"/>
-        <source>Portuguese (Brazil, Dvorak)</source>
+        <source>Pannonian Rusyn</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="684"/>
-        <source>Portuguese (Brazil, IBM/Lenovo ThinkPad)</source>
+        <source>Pashto</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="685"/>
-        <source>Portuguese (Brazil, Nativo for US keyboards)</source>
+        <source>Pashto (Afghanistan, OLPC)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="686"/>
-        <source>Portuguese (Brazil, Nativo)</source>
+        <source>Persian (Afghanistan, Dari OLPC)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="687"/>
-        <source>Portuguese (Brazil, no dead keys)</source>
+        <source>Persian (with Persian keypad)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="688"/>
-        <source>Portuguese (Macintosh)</source>
+        <source>Polish (British keyboard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="689"/>
-        <source>Portuguese (Macintosh, Sun dead keys)</source>
+        <source>Polish (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="690"/>
-        <source>Portuguese (Macintosh, no dead keys)</source>
+        <source>Polish (Dvorak, with Polish quotes on key 1)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="691"/>
-        <source>Portuguese (Nativo for US keyboards)</source>
+        <source>Polish (Dvorak, with Polish quotes on quotemark key)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="692"/>
-        <source>Portuguese (Nativo)</source>
+        <source>Polish (QWERTZ)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="693"/>
-        <source>Portuguese (Sun dead keys)</source>
+        <source>Polish (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="694"/>
-        <source>Portuguese (no dead keys)</source>
+        <source>Polish (programmer Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="695"/>
-        <source>Punjabi (Gurmukhi Jhelum)</source>
+        <source>Portuguese (Brazil, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="696"/>
-        <source>Punjabi (Gurmukhi)</source>
+        <source>Portuguese (Brazil, IBM/Lenovo ThinkPad)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="697"/>
-        <source>Romanian (Germany)</source>
+        <source>Portuguese (Brazil, Nativo for US keyboards)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="698"/>
-        <source>Romanian (Germany, no dead keys)</source>
+        <source>Portuguese (Brazil, Nativo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="699"/>
-        <source>Romanian (Windows)</source>
+        <source>Portuguese (Brazil, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="700"/>
-        <source>Romanian (cedilla)</source>
+        <source>Portuguese (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="701"/>
-        <source>Romanian (standard cedilla)</source>
+        <source>Portuguese (Macintosh, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="702"/>
-        <source>Romanian (standard)</source>
+        <source>Portuguese (Macintosh, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="703"/>
-        <source>Russian (Belarus)</source>
+        <source>Portuguese (Nativo for US keyboards)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="704"/>
-        <source>Russian (Czech, phonetic)</source>
+        <source>Portuguese (Nativo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="705"/>
-        <source>Russian (DOS)</source>
+        <source>Portuguese (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="706"/>
-        <source>Russian (Georgia)</source>
+        <source>Portuguese (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="707"/>
-        <source>Russian (Germany, phonetic)</source>
+        <source>Punjabi (Gurmukhi Jhelum)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="708"/>
-        <source>Russian (Kazakhstan, with Kazakh)</source>
+        <source>Punjabi (Gurmukhi)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="709"/>
-        <source>Russian (Macintosh)</source>
+        <source>Romanian (Germany)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="710"/>
-        <source>Russian (Poland, phonetic Dvorak)</source>
+        <source>Romanian (Germany, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="711"/>
-        <source>Russian (Sweden, phonetic)</source>
+        <source>Romanian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="712"/>
-        <source>Russian (Sweden, phonetic, no dead keys)</source>
+        <source>Romanian (cedilla)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="713"/>
-        <source>Russian (US, phonetic)</source>
+        <source>Romanian (standard cedilla)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="714"/>
-        <source>Russian (Ukraine, standard RSTU)</source>
+        <source>Romanian (standard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="715"/>
-        <source>Russian (legacy)</source>
+        <source>Russian (Belarus)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="716"/>
-        <source>Russian (phonetic)</source>
+        <source>Russian (Czech, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="717"/>
-        <source>Russian (phonetic, AZERTY)</source>
+        <source>Russian (DOS)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="718"/>
-        <source>Russian (phonetic, Dvorak)</source>
+        <source>Russian (Georgia)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="719"/>
-        <source>Russian (phonetic, French)</source>
+        <source>Russian (Germany, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="720"/>
-        <source>Russian (phonetic, Windows)</source>
+        <source>Russian (Kazakhstan, with Kazakh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="721"/>
-        <source>Russian (phonetic, YAZHERTY)</source>
+        <source>Russian (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="722"/>
-        <source>Russian (typewriter)</source>
+        <source>Russian (Poland, phonetic Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="723"/>
-        <source>Russian (typewriter, legacy)</source>
+        <source>Russian (Sweden, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="724"/>
-        <source>Saisiyat (Taiwan)</source>
+        <source>Russian (Sweden, phonetic, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="725"/>
-        <source>Samogitian</source>
+        <source>Russian (US, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="726"/>
-        <source>Sanskrit (KaGaPa, phonetic)</source>
+        <source>Russian (Ukraine, standard RSTU)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="727"/>
-        <source>Serbian (Cyrillic, ZE and ZHE swapped)</source>
+        <source>Russian (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="728"/>
-        <source>Serbian (Cyrillic, with guillemets)</source>
+        <source>Russian (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="729"/>
-        <source>Serbian (Latin)</source>
+        <source>Russian (phonetic, AZERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="730"/>
-        <source>Serbian (Latin, QWERTY)</source>
+        <source>Russian (phonetic, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="731"/>
-        <source>Serbian (Latin, Unicode)</source>
+        <source>Russian (phonetic, French)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="732"/>
-        <source>Serbian (Latin, Unicode, QWERTY)</source>
+        <source>Russian (phonetic, Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="733"/>
-        <source>Serbian (Latin, with guillemets)</source>
+        <source>Russian (phonetic, YAZHERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="734"/>
-        <source>Serbian (Russia)</source>
+        <source>Russian (typewriter)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="735"/>
-        <source>Serbo-Croatian (US)</source>
+        <source>Russian (typewriter, legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="736"/>
-        <source>Sicilian</source>
+        <source>Saisiyat (Taiwan)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="737"/>
-        <source>Silesian</source>
+        <source>Samogitian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="738"/>
-        <source>Sindhi</source>
+        <source>Sanskrit (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="739"/>
-        <source>Sinhala (US)</source>
+        <source>Serbian (Cyrillic, ZE and ZHE swapped)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="740"/>
-        <source>Slovak (QWERTY)</source>
+        <source>Serbian (Cyrillic, with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="741"/>
-        <source>Slovak (QWERTY, extended backslash)</source>
+        <source>Serbian (Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="742"/>
-        <source>Slovak (extended backslash)</source>
+        <source>Serbian (Latin, QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="743"/>
-        <source>Slovenian (US)</source>
+        <source>Serbian (Latin, Unicode)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="744"/>
-        <source>Slovenian (with guillemets)</source>
+        <source>Serbian (Latin, Unicode, QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="745"/>
-        <source>Spanish (Dvorak)</source>
+        <source>Serbian (Latin, with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="746"/>
-        <source>Spanish (Latin American, Colemak for gaming)</source>
+        <source>Serbian (Russia)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="747"/>
-        <source>Spanish (Latin American, Colemak)</source>
+        <source>Serbo-Croatian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="748"/>
-        <source>Spanish (Latin American, Dvorak)</source>
+        <source>Sicilian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="749"/>
-        <source>Spanish (Latin American, Sun dead keys)</source>
+        <source>Silesian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="750"/>
-        <source>Spanish (Latin American, dead tilde)</source>
+        <source>Sindhi</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="751"/>
-        <source>Spanish (Latin American, no dead keys)</source>
+        <source>Sinhala (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="752"/>
-        <source>Spanish (Macintosh)</source>
+        <source>Slovak (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="753"/>
-        <source>Spanish (Sun dead keys)</source>
+        <source>Slovak (QWERTY, extended backslash)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="754"/>
-        <source>Spanish (Windows)</source>
+        <source>Slovak (extended backslash)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="755"/>
-        <source>Spanish (dead tilde)</source>
+        <source>Slovenian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="756"/>
-        <source>Spanish (no dead keys)</source>
+        <source>Slovenian (with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="757"/>
-        <source>Swedish (Dvorak)</source>
+        <source>Spanish (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="758"/>
-        <source>Swedish (Dvorak, intl.)</source>
+        <source>Spanish (Latin American, Colemak for gaming)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="759"/>
-        <source>Swedish (Macintosh)</source>
+        <source>Spanish (Latin American, Colemak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="760"/>
-        <source>Swedish (Svdvorak)</source>
+        <source>Spanish (Latin American, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="761"/>
-        <source>Swedish (US)</source>
+        <source>Spanish (Latin American, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="762"/>
-        <source>Swedish (no dead keys)</source>
+        <source>Spanish (Latin American, dead tilde)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="763"/>
-        <source>Swedish Sign Language</source>
+        <source>Spanish (Latin American, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="764"/>
-        <source>Syriac</source>
+        <source>Spanish (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="765"/>
-        <source>Syriac (phonetic)</source>
+        <source>Spanish (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="766"/>
-        <source>Taiwanese (indigenous)</source>
+        <source>Spanish (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="767"/>
-        <source>Tajik (legacy)</source>
+        <source>Spanish (dead tilde)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="768"/>
-        <source>Tamil (Inscript)</source>
+        <source>Spanish (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="769"/>
-        <source>Tamil (Sri Lanka, TamilNet &apos;99)</source>
+        <source>Swedish (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="770"/>
-        <source>Tamil (Sri Lanka, TamilNet &apos;99, TAB encoding)</source>
+        <source>Swedish (Dvorak, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="771"/>
-        <source>Tamil (TamilNet &apos;99 with Tamil numerals)</source>
+        <source>Swedish (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="772"/>
-        <source>Tamil (TamilNet &apos;99)</source>
+        <source>Swedish (Svdvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="773"/>
-        <source>Tamil (TamilNet &apos;99, TAB encoding)</source>
+        <source>Swedish (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="774"/>
-        <source>Tamil (TamilNet &apos;99, TSCII encoding)</source>
+        <source>Swedish (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="775"/>
-        <source>Tatar</source>
+        <source>Swedish Sign Language</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="776"/>
-        <source>Telugu</source>
+        <source>Syriac</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="777"/>
-        <source>Telugu (KaGaPa, phonetic)</source>
+        <source>Syriac (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="778"/>
-        <source>Telugu (Sarala)</source>
+        <source>Taiwanese (indigenous)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="779"/>
-        <source>Thai (Pattachote)</source>
+        <source>Tajik (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="780"/>
-        <source>Thai (TIS-820.2538)</source>
+        <source>Tamil (Inscript)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="781"/>
-        <source>Tibetan</source>
+        <source>Tamil (Sri Lanka, TamilNet &apos;99)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="782"/>
-        <source>Tibetan (with ASCII numerals)</source>
+        <source>Tamil (Sri Lanka, TamilNet &apos;99, TAB encoding)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="783"/>
-        <source>Turkish (Alt-Q)</source>
+        <source>Tamil (TamilNet &apos;99 with Tamil numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="784"/>
-        <source>Turkish (F)</source>
+        <source>Tamil (TamilNet &apos;99)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="785"/>
-        <source>Turkish (Germany)</source>
+        <source>Tamil (TamilNet &apos;99, TAB encoding)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="786"/>
-        <source>Turkish (Sun dead keys)</source>
+        <source>Tamil (TamilNet &apos;99, TSCII encoding)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="787"/>
-        <source>Turkish (intl., with dead keys)</source>
+        <source>Tatar</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="788"/>
-        <source>Turkmen (Alt-Q)</source>
+        <source>Telugu</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="789"/>
-        <source>Udmurt</source>
+        <source>Telugu (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="790"/>
-        <source>Ukrainian (Windows)</source>
+        <source>Telugu (Sarala)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="791"/>
-        <source>Ukrainian (homophonic)</source>
+        <source>Thai (Pattachote)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="792"/>
-        <source>Ukrainian (legacy)</source>
+        <source>Thai (TIS-820.2538)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="793"/>
-        <source>Ukrainian (phonetic)</source>
+        <source>Tibetan</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="794"/>
-        <source>Ukrainian (standard RSTU)</source>
+        <source>Tibetan (with ASCII numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="795"/>
-        <source>Ukrainian (typewriter)</source>
+        <source>Turkish (Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="796"/>
-        <source>Urdu (Pakistan, CRULP)</source>
+        <source>Turkish (F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="797"/>
-        <source>Urdu (Pakistan, NLA)</source>
+        <source>Turkish (Germany)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="798"/>
-        <source>Urdu (Windows)</source>
+        <source>Turkish (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="799"/>
-        <source>Urdu (alt. phonetic)</source>
+        <source>Turkish (intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="800"/>
-        <source>Urdu (phonetic)</source>
+        <source>Turkmen (Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="801"/>
-        <source>Uyghur</source>
+        <source>Udmurt</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="802"/>
-        <source>Uzbek (Afghanistan)</source>
+        <source>Ukrainian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="803"/>
-        <source>Uzbek (Afghanistan, OLPC)</source>
+        <source>Ukrainian (homophonic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="804"/>
-        <source>Uzbek (Latin)</source>
+        <source>Ukrainian (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="805"/>
-        <source>Vietnamese (French)</source>
+        <source>Ukrainian (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="806"/>
-        <source>Vietnamese (US)</source>
+        <source>Ukrainian (standard RSTU)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="807"/>
-        <source>Yakut</source>
+        <source>Ukrainian (typewriter)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="808"/>
+        <source>Urdu (Pakistan, CRULP)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="809"/>
+        <source>Urdu (Pakistan, NLA)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="810"/>
+        <source>Urdu (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="811"/>
+        <source>Urdu (alt. phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="812"/>
+        <source>Urdu (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="813"/>
+        <source>Uyghur</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="814"/>
+        <source>Uzbek (Afghanistan)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="815"/>
+        <source>Uzbek (Afghanistan, OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="816"/>
+        <source>Uzbek (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="817"/>
+        <source>Vietnamese (French)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="818"/>
+        <source>Vietnamese (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="819"/>
+        <source>Yakut</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="820"/>
         <source>Yoruba</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
diff --git a/lang/kb_tg.ts b/lang/kb_tg.ts
index 10b48e701..fb18f9995 100644
--- a/lang/kb_tg.ts
+++ b/lang/kb_tg.ts
@@ -2,4605 +2,4617 @@
 <!DOCTYPE TS>
 <TS version="2.1" language="en_US">
 <context>
-    <name>QObject</name>
+    <name>kb_layouts</name>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="22"/>
-        <source>A4Tech KB-21</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="23"/>
-        <source>A4Tech KBS-8</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="24"/>
-        <source>A4Tech Wireless Desktop RFKB-23</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="25"/>
-        <source>Acer AirKey V</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="26"/>
-        <source>Acer C300</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="27"/>
-        <source>Acer Ferrari 4000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="28"/>
-        <source>Acer laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="29"/>
-        <source>Advance Scorpius KI</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="30"/>
-        <source>Apple</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="31"/>
-        <source>Apple Aluminium (ANSI)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="32"/>
-        <source>Apple Aluminium (ISO)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="33"/>
-        <source>Apple Aluminium (JIS)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="34"/>
-        <source>Apple laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="35"/>
-        <source>Asus laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="36"/>
-        <source>Azona RF2300 wireless Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="37"/>
-        <source>BTC 5090</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="38"/>
-        <source>BTC 5113RF Multimedia</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="39"/>
-        <source>BTC 5126T</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="40"/>
-        <source>BTC 6301URF</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="41"/>
-        <source>BTC 9000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="42"/>
-        <source>BTC 9000A</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="43"/>
-        <source>BTC 9001AH</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="44"/>
-        <source>BTC 9019U</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="45"/>
-        <source>BTC 9116U Mini Wireless Internet and Gaming</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="46"/>
-        <source>BenQ X-Touch</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="47"/>
-        <source>BenQ X-Touch 730</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="48"/>
-        <source>BenQ X-Touch 800</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="49"/>
-        <source>Brother Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="50"/>
-        <source>Cherry B.UNLIMITED</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="51"/>
-        <source>Cherry Blue Line CyBo@rd</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="52"/>
-        <source>Cherry Blue Line CyBo@rd (alt.)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="53"/>
-        <source>Cherry CyBo@rd USB-Hub</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="54"/>
-        <source>Cherry CyMotion Expert</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="55"/>
-        <source>Cherry CyMotion Master Linux</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="56"/>
-        <source>Cherry CyMotion Master XPress</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="57"/>
-        <source>Chicony Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="58"/>
-        <source>Chicony KB-9885</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="59"/>
-        <source>Chicony KU-0108</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="60"/>
-        <source>Chicony KU-0420</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="61"/>
-        <source>Chromebook</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="62"/>
-        <source>Classmate PC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="63"/>
-        <source>Compaq Armada laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="64"/>
-        <source>Compaq Easy Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="65"/>
-        <source>Compaq Internet (13 keys)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="66"/>
-        <source>Compaq Internet (18 keys)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="67"/>
-        <source>Compaq Internet (7 keys)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="68"/>
-        <source>Compaq Presario laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="69"/>
-        <source>Compaq iPaq</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="70"/>
-        <source>Creative Desktop Wireless 7000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="71"/>
-        <source>DTK2000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="72"/>
-        <source>Dell</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="73"/>
-        <source>Dell 101-key PC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="74"/>
-        <source>Dell Inspiron 6000/8000 laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="75"/>
-        <source>Dell Latitude laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="76"/>
-        <source>Dell Precision M laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="77"/>
-        <source>Dell Precision M65 laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="78"/>
-        <source>Dell SK-8125</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="79"/>
-        <source>Dell SK-8135</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="80"/>
-        <source>Dell USB Multimedia</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="81"/>
-        <source>Dexxa Wireless Desktop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="82"/>
-        <source>Diamond 9801/9802</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="83"/>
-        <source>Ennyah DKB-1008</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="84"/>
-        <source>Everex STEPnote</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="85"/>
-        <source>FL90</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="86"/>
-        <source>Fujitsu-Siemens Amilo laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="87"/>
-        <source>Generic 101-key PC</source>
-        <comment>kb_models</comment>
-        <translation>Общий 101-ключ</translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="88"/>
-        <source>Generic 102-key PC</source>
-        <comment>kb_models</comment>
-        <translation>Общий 102-ключ</translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="89"/>
-        <source>Generic 104-key PC</source>
-        <comment>kb_models</comment>
-        <translation>Общий 104-ключ</translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="90"/>
-        <source>Generic 104-key PC with L-shaped Enter key</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="91"/>
-        <source>Generic 105-key PC</source>
-        <comment>kb_models</comment>
-        <translation>Общий 105-ключ</translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="92"/>
-        <source>Generic 86-key PC</source>
-        <comment>kb_models</comment>
-        <translation>Общий 86-ключ</translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="93"/>
-        <source>Genius Comfy KB-12e</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="94"/>
-        <source>Genius Comfy KB-16M/Multimedia KWD-910</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="95"/>
-        <source>Genius Comfy KB-21e-Scroll</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="96"/>
-        <source>Genius KB-19e NB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="97"/>
-        <source>Genius KKB-2050HS</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="98"/>
-        <source>Gyration</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="99"/>
-        <source>Happy Hacking</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="100"/>
-        <source>Happy Hacking for Mac</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="101"/>
-        <source>Hewlett-Packard Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="102"/>
-        <source>Hewlett-Packard Mini 110 laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="103"/>
-        <source>Hewlett-Packard NEC SK-2500 Multimedia</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="104"/>
-        <source>Hewlett-Packard Omnibook 500</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="105"/>
-        <source>Hewlett-Packard Omnibook 500 FA</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="106"/>
-        <source>Hewlett-Packard Omnibook 6000/6100</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="107"/>
-        <source>Hewlett-Packard Omnibook XE3 GC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="108"/>
-        <source>Hewlett-Packard Omnibook XE3 GF</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="109"/>
-        <source>Hewlett-Packard Omnibook XT1000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="110"/>
-        <source>Hewlett-Packard Pavilion ZT1100</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="111"/>
-        <source>Hewlett-Packard Pavilion dv5</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="112"/>
-        <source>Hewlett-Packard nx9020</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="113"/>
-        <source>Honeywell Euroboard</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="114"/>
-        <source>IBM Rapid Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="115"/>
-        <source>IBM Rapid Access II</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="116"/>
-        <source>IBM Space Saver</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="117"/>
-        <source>IBM ThinkPad 560Z/600/600E/A22E</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="118"/>
-        <source>IBM ThinkPad R60/T60/R61/T61</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="119"/>
-        <source>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="120"/>
-        <source>Keytronic FlexPro</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="121"/>
-        <source>Kinesis</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="122"/>
-        <source>Logitech</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="123"/>
-        <source>Logitech Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="124"/>
-        <source>Logitech Cordless Desktop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="125"/>
-        <source>Logitech Cordless Desktop (alt.)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="126"/>
-        <source>Logitech Cordless Desktop EX110</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="127"/>
-        <source>Logitech Cordless Desktop LX-300</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="128"/>
-        <source>Logitech Cordless Desktop Navigator</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="129"/>
-        <source>Logitech Cordless Desktop Optical</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="130"/>
-        <source>Logitech Cordless Desktop Pro (2nd alt.)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="131"/>
-        <source>Logitech Cordless Desktop iTouch</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="132"/>
-        <source>Logitech Cordless Freedom/Desktop Navigator</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="133"/>
-        <source>Logitech G15 extra keys via G15daemon</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="134"/>
-        <source>Logitech Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="135"/>
-        <source>Logitech Internet 350</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="136"/>
-        <source>Logitech Internet Navigator</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="137"/>
-        <source>Logitech Ultra-X</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="138"/>
-        <source>Logitech Ultra-X Cordless Media Desktop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="139"/>
-        <source>Logitech diNovo</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="140"/>
-        <source>Logitech diNovo Edge</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="141"/>
-        <source>Logitech iTouch</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="142"/>
-        <source>Logitech iTouch Cordless Y-RB6</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="143"/>
-        <source>Logitech iTouch Internet Navigator SE</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="144"/>
-        <source>Logitech iTouch Internet Navigator SE USB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="145"/>
-        <source>MacBook/MacBook Pro</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="146"/>
-        <source>MacBook/MacBook Pro (intl.)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="147"/>
-        <source>Macintosh</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="148"/>
-        <source>Macintosh Old</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="149"/>
-        <source>Memorex MX1998</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="150"/>
-        <source>Memorex MX2500 EZ-Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="151"/>
-        <source>Memorex MX2750</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="152"/>
-        <source>Microsoft Comfort Curve 2000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="153"/>
-        <source>Microsoft Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="154"/>
-        <source>Microsoft Internet Pro (Swedish)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="155"/>
-        <source>Microsoft Natural</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="156"/>
-        <source>Microsoft Natural Elite</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="157"/>
-        <source>Microsoft Natural Ergonomic 4000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="158"/>
-        <source>Microsoft Natural Pro OEM</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="159"/>
-        <source>Microsoft Natural Pro USB/Internet Pro</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="160"/>
-        <source>Microsoft Natural Pro/Internet Pro</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="161"/>
-        <source>Microsoft Natural Wireless Ergonomic 7000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="162"/>
-        <source>Microsoft Office Keyboard</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="163"/>
-        <source>Microsoft Surface</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="164"/>
-        <source>Microsoft Wireless Multimedia 1.0A</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="165"/>
-        <source>NEC SK-1300</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="166"/>
-        <source>NEC SK-2500</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="167"/>
-        <source>NEC SK-6200</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="168"/>
-        <source>NEC SK-7100</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="169"/>
-        <source>Northgate OmniKey 101</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="170"/>
-        <source>OLPC</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="171"/>
-        <source>Ortek Multimedia/Internet MCK-800</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="172"/>
-        <source>PC-98</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="173"/>
-        <source>Propeller Voyager KTEZ-1000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="174"/>
-        <source>QTronix Scorpius 98N+</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="175"/>
-        <source>SVEN Ergonomic 2500</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="176"/>
-        <source>SVEN Slim 303</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="177"/>
-        <source>Samsung SDM 4500P</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="178"/>
-        <source>Samsung SDM 4510P</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="179"/>
-        <source>Sanwa Supply SKB-KG3</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="180"/>
-        <source>Silvercrest Multimedia Wireless</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="181"/>
-        <source>SteelSeries Apex 300 (Apex RAW)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="182"/>
-        <source>Sun Type 6 (Japanese)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="183"/>
-        <source>Sun Type 6 USB (Japanese)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="184"/>
-        <source>Sun Type 6 USB (Unix)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="185"/>
-        <source>Sun Type 6/7 USB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="186"/>
-        <source>Sun Type 6/7 USB (European)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="187"/>
-        <source>Sun Type 7 USB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="188"/>
-        <source>Sun Type 7 USB (European)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="189"/>
-        <source>Sun Type 7 USB (Japanese)/Japanese 106-key</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="190"/>
-        <source>Sun Type 7 USB (Unix)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="191"/>
-        <source>Super Power Multimedia</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="192"/>
-        <source>Symplon PaceBook tablet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="193"/>
-        <source>Targa Visionary 811</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="194"/>
-        <source>Toshiba Satellite S3000</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="195"/>
-        <source>Truly Ergonomic 227</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="196"/>
-        <source>Truly Ergonomic 229</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="197"/>
-        <source>Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="198"/>
-        <source>Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="199"/>
-        <source>Trust Direct Access</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="200"/>
-        <source>Trust Slimline</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="201"/>
-        <source>Trust Wireless Classic</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="202"/>
-        <source>TypeMatrix EZ-Reach 2020</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="203"/>
-        <source>TypeMatrix EZ-Reach 2030 PS2</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="204"/>
-        <source>TypeMatrix EZ-Reach 2030 USB</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="205"/>
-        <source>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="206"/>
-        <source>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="207"/>
-        <source>Unitek KB-1925</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="208"/>
-        <source>ViewSonic KU-306 Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="209"/>
-        <source>Winbook Model XP5</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="210"/>
-        <source>Yahoo! Internet</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="211"/>
-        <source>eMachines m6800 laptop</source>
-        <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="222"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="229"/>
         <source>Afghani</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="223"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="230"/>
         <source>Albanian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="224"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="231"/>
         <source>Amharic</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="225"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="232"/>
         <source>Arabic</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="226"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="233"/>
         <source>Arabic (Morocco)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="227"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="234"/>
         <source>Arabic (Syria)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="228"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="235"/>
         <source>Armenian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="229"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="236"/>
         <source>Azerbaijani</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="230"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="237"/>
         <source>Bambara</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="231"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="238"/>
         <source>Bangla</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="232"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="239"/>
         <source>Belarusian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="233"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="240"/>
         <source>Belgian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="234"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="241"/>
         <source>Bosnian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="235"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="242"/>
         <source>Braille</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="236"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="243"/>
         <source>Bulgarian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="237"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="244"/>
         <source>Burmese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="238"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="245"/>
         <source>Chinese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="239"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="246"/>
         <source>Croatian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="240"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="247"/>
         <source>Czech</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="241"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="248"/>
         <source>Danish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="242"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="249"/>
         <source>Dhivehi</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="243"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="250"/>
         <source>Dutch</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="244"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="251"/>
         <source>Dzongkha</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="245"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="252"/>
         <source>English (Australian)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="246"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="253"/>
         <source>English (Cameroon)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="247"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="254"/>
         <source>English (Ghana)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="248"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="255"/>
         <source>English (Nigeria)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="249"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="256"/>
         <source>English (South Africa)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="250"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="257"/>
         <source>English (UK)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="251"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="258"/>
         <source>English (US)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="252"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="259"/>
         <source>Esperanto</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="253"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="260"/>
         <source>Estonian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="254"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="261"/>
         <source>Faroese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="255"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="262"/>
         <source>Filipino</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="256"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="263"/>
         <source>Finnish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="257"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="264"/>
         <source>French</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="258"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="265"/>
         <source>French (Canada)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="259"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="266"/>
         <source>French (Democratic Republic of the Congo)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="260"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="267"/>
         <source>French (Guinea)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="261"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="268"/>
         <source>French (Togo)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="262"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="269"/>
         <source>Georgian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="263"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="270"/>
         <source>German</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="264"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="271"/>
         <source>German (Austria)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="265"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="272"/>
         <source>German (Switzerland)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="266"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="273"/>
         <source>Greek</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="267"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="274"/>
         <source>Hebrew</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="268"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="275"/>
         <source>Hungarian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="269"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="276"/>
         <source>Icelandic</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="270"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="277"/>
         <source>Indian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="271"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="278"/>
         <source>Indonesian (Arab Melayu, phonetic)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="272"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="279"/>
         <source>Indonesian (Javanese)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="273"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="280"/>
         <source>Iraqi</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="274"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="281"/>
         <source>Irish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="275"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="282"/>
         <source>Italian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="276"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="283"/>
         <source>Japanese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="277"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="284"/>
         <source>Japanese (PC-98)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="278"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="285"/>
         <source>Kabylian (azerty layout, no dead keys)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="279"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="286"/>
         <source>Kazakh</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="280"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="287"/>
         <source>Khmer (Cambodia)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="281"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="288"/>
         <source>Korean</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="282"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="289"/>
         <source>Kyrgyz</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="283"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="290"/>
         <source>Lao</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="284"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="291"/>
         <source>Latvian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="285"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="292"/>
         <source>Lithuanian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="286"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="293"/>
         <source>Macedonian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="287"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="294"/>
         <source>Malay (Jawi, Arabic Keyboard)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="288"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="295"/>
         <source>Maltese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="289"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="296"/>
         <source>Maori</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="290"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="297"/>
         <source>Moldavian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="291"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="298"/>
         <source>Mongolian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="292"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="299"/>
         <source>Montenegrin</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="293"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="300"/>
         <source>Nepali</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="294"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="301"/>
         <source>Norwegian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="295"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="302"/>
         <source>Persian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="296"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="303"/>
         <source>Polish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="297"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="304"/>
         <source>Portuguese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="298"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="305"/>
         <source>Portuguese (Brazil)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="299"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="306"/>
         <source>Romanian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="300"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="307"/>
         <source>Russian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="301"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="308"/>
         <source>Serbian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="302"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="309"/>
         <source>Sinhala (phonetic)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="303"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="310"/>
         <source>Slovak</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="304"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="311"/>
         <source>Slovenian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="305"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="312"/>
         <source>Spanish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="306"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="313"/>
         <source>Spanish (Latin American)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="307"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="314"/>
         <source>Swahili (Kenya)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="308"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="315"/>
         <source>Swahili (Tanzania)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="309"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="316"/>
         <source>Swedish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="310"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="317"/>
         <source>Taiwanese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="311"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="318"/>
         <source>Tajik</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Тоҷикӣ</translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="312"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="319"/>
         <source>Thai</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="313"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="320"/>
         <source>Tswana</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="314"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="321"/>
         <source>Turkish</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="315"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="322"/>
         <source>Turkmen</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="316"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="323"/>
         <source>Ukrainian</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="317"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="324"/>
         <source>Urdu (Pakistan)</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="318"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="325"/>
         <source>Uzbek</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="319"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="326"/>
         <source>Vietnamese</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="320"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="327"/>
         <source>Wolof</source>
         <comment>kb_layouts</comment>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>kb_models</name>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="331"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="25"/>
+        <source>A4Tech KB-21</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="26"/>
+        <source>A4Tech KBS-8</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="27"/>
+        <source>A4Tech Wireless Desktop RFKB-23</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="28"/>
+        <source>Acer AirKey V</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="29"/>
+        <source>Acer C300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="30"/>
+        <source>Acer Ferrari 4000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="31"/>
+        <source>Acer laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="32"/>
+        <source>Advance Scorpius KI</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="33"/>
+        <source>Apple</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="34"/>
+        <source>Apple Aluminium (ANSI)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="35"/>
+        <source>Apple Aluminium (ISO)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="36"/>
+        <source>Apple Aluminium (JIS)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="37"/>
+        <source>Apple laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="38"/>
+        <source>Asus laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="39"/>
+        <source>Azona RF2300 wireless Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="40"/>
+        <source>BTC 5090</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="41"/>
+        <source>BTC 5113RF Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="42"/>
+        <source>BTC 5126T</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="43"/>
+        <source>BTC 6301URF</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="44"/>
+        <source>BTC 9000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="45"/>
+        <source>BTC 9000A</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="46"/>
+        <source>BTC 9001AH</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="47"/>
+        <source>BTC 9019U</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="48"/>
+        <source>BTC 9116U Mini Wireless Internet and Gaming</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="49"/>
+        <source>BenQ X-Touch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="50"/>
+        <source>BenQ X-Touch 730</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="51"/>
+        <source>BenQ X-Touch 800</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="52"/>
+        <source>Brother Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="53"/>
+        <source>Cherry B.UNLIMITED</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="54"/>
+        <source>Cherry Blue Line CyBo@rd</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="55"/>
+        <source>Cherry Blue Line CyBo@rd (alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="56"/>
+        <source>Cherry CyBo@rd USB-Hub</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="57"/>
+        <source>Cherry CyMotion Expert</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="58"/>
+        <source>Cherry CyMotion Master Linux</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="59"/>
+        <source>Cherry CyMotion Master XPress</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="60"/>
+        <source>Chicony Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="61"/>
+        <source>Chicony KB-9885</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="62"/>
+        <source>Chicony KU-0108</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="63"/>
+        <source>Chicony KU-0420</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="64"/>
+        <source>Chromebook</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="65"/>
+        <source>Classmate PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="66"/>
+        <source>Compaq Armada laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="67"/>
+        <source>Compaq Easy Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="68"/>
+        <source>Compaq Internet (13 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="69"/>
+        <source>Compaq Internet (18 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="70"/>
+        <source>Compaq Internet (7 keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="71"/>
+        <source>Compaq Presario laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="72"/>
+        <source>Compaq iPaq</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="73"/>
+        <source>Creative Desktop Wireless 7000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="74"/>
+        <source>DTK2000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="75"/>
+        <source>Dell</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="76"/>
+        <source>Dell 101-key PC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="77"/>
+        <source>Dell Inspiron 6000/8000 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="78"/>
+        <source>Dell Latitude laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="79"/>
+        <source>Dell Precision M laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="80"/>
+        <source>Dell Precision M65 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="81"/>
+        <source>Dell SK-8125</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="82"/>
+        <source>Dell SK-8135</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="83"/>
+        <source>Dell USB Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="84"/>
+        <source>Dexxa Wireless Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="85"/>
+        <source>Diamond 9801/9802</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="86"/>
+        <source>Ennyah DKB-1008</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="87"/>
+        <source>Everex STEPnote</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="88"/>
+        <source>FL90</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="89"/>
+        <source>Fujitsu-Siemens Amilo laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="90"/>
+        <source>Generic 101-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 101-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="91"/>
+        <source>Generic 102-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 102-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="92"/>
+        <source>Generic 104-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 104-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="93"/>
+        <source>Generic 104-key PC with L-shaped Enter key</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="94"/>
+        <source>Generic 105-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 105-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="95"/>
+        <source>Generic 86-key PC</source>
+        <comment>kb_models</comment>
+        <translation>Общий 86-ключ</translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="96"/>
+        <source>Genius Comfy KB-12e</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="97"/>
+        <source>Genius Comfy KB-16M/Multimedia KWD-910</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="98"/>
+        <source>Genius Comfy KB-21e-Scroll</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="99"/>
+        <source>Genius KB-19e NB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="100"/>
+        <source>Genius KKB-2050HS</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="101"/>
+        <source>Gyration</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="102"/>
+        <source>Happy Hacking</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="103"/>
+        <source>Happy Hacking for Mac</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="104"/>
+        <source>Hewlett-Packard Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="105"/>
+        <source>Hewlett-Packard Mini 110 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="106"/>
+        <source>Hewlett-Packard NEC SK-2500 Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="107"/>
+        <source>Hewlett-Packard Omnibook 500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="108"/>
+        <source>Hewlett-Packard Omnibook 500 FA</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="109"/>
+        <source>Hewlett-Packard Omnibook 6000/6100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="110"/>
+        <source>Hewlett-Packard Omnibook XE3 GC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="111"/>
+        <source>Hewlett-Packard Omnibook XE3 GF</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="112"/>
+        <source>Hewlett-Packard Omnibook XT1000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="113"/>
+        <source>Hewlett-Packard Pavilion ZT1100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="114"/>
+        <source>Hewlett-Packard Pavilion dv5</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="115"/>
+        <source>Hewlett-Packard nx9020</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="116"/>
+        <source>Honeywell Euroboard</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="117"/>
+        <source>IBM Rapid Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="118"/>
+        <source>IBM Rapid Access II</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="119"/>
+        <source>IBM Space Saver</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="120"/>
+        <source>IBM ThinkPad 560Z/600/600E/A22E</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="121"/>
+        <source>IBM ThinkPad R60/T60/R61/T61</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="122"/>
+        <source>IBM ThinkPad Z60m/Z60t/Z61m/Z61t</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="123"/>
+        <source>Keytronic FlexPro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="124"/>
+        <source>Kinesis</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="125"/>
+        <source>Logitech</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="126"/>
+        <source>Logitech Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="127"/>
+        <source>Logitech Cordless Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="128"/>
+        <source>Logitech Cordless Desktop (alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="129"/>
+        <source>Logitech Cordless Desktop EX110</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="130"/>
+        <source>Logitech Cordless Desktop LX-300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="131"/>
+        <source>Logitech Cordless Desktop Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="132"/>
+        <source>Logitech Cordless Desktop Optical</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="133"/>
+        <source>Logitech Cordless Desktop Pro (2nd alt.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="134"/>
+        <source>Logitech Cordless Desktop iTouch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="135"/>
+        <source>Logitech Cordless Freedom/Desktop Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="136"/>
+        <source>Logitech G15 extra keys via G15daemon</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="137"/>
+        <source>Logitech Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="138"/>
+        <source>Logitech Internet 350</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="139"/>
+        <source>Logitech Internet Navigator</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="140"/>
+        <source>Logitech Ultra-X</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="141"/>
+        <source>Logitech Ultra-X Cordless Media Desktop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="142"/>
+        <source>Logitech diNovo</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="143"/>
+        <source>Logitech diNovo Edge</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="144"/>
+        <source>Logitech iTouch</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="145"/>
+        <source>Logitech iTouch Cordless Y-RB6</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="146"/>
+        <source>Logitech iTouch Internet Navigator SE</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="147"/>
+        <source>Logitech iTouch Internet Navigator SE USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="148"/>
+        <source>MacBook/MacBook Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="149"/>
+        <source>MacBook/MacBook Pro (intl.)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="150"/>
+        <source>Macintosh</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="151"/>
+        <source>Macintosh Old</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="152"/>
+        <source>Memorex MX1998</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="153"/>
+        <source>Memorex MX2500 EZ-Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="154"/>
+        <source>Memorex MX2750</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="155"/>
+        <source>Microsoft Comfort Curve 2000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="156"/>
+        <source>Microsoft Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="157"/>
+        <source>Microsoft Internet Pro (Swedish)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="158"/>
+        <source>Microsoft Natural</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="159"/>
+        <source>Microsoft Natural Elite</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="160"/>
+        <source>Microsoft Natural Ergonomic 4000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="161"/>
+        <source>Microsoft Natural Pro OEM</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="162"/>
+        <source>Microsoft Natural Pro USB/Internet Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="163"/>
+        <source>Microsoft Natural Pro/Internet Pro</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="164"/>
+        <source>Microsoft Natural Wireless Ergonomic 7000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="165"/>
+        <source>Microsoft Office Keyboard</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="166"/>
+        <source>Microsoft Surface</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="167"/>
+        <source>Microsoft Wireless Multimedia 1.0A</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="168"/>
+        <source>NEC SK-1300</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="169"/>
+        <source>NEC SK-2500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="170"/>
+        <source>NEC SK-6200</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="171"/>
+        <source>NEC SK-7100</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="172"/>
+        <source>Northgate OmniKey 101</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="173"/>
+        <source>OLPC</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="174"/>
+        <source>Ortek Multimedia/Internet MCK-800</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="175"/>
+        <source>PC-98</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="176"/>
+        <source>Propeller Voyager KTEZ-1000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="177"/>
+        <source>QTronix Scorpius 98N+</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="178"/>
+        <source>SVEN Ergonomic 2500</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="179"/>
+        <source>SVEN Slim 303</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="180"/>
+        <source>Samsung SDM 4500P</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="181"/>
+        <source>Samsung SDM 4510P</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="182"/>
+        <source>Sanwa Supply SKB-KG3</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="183"/>
+        <source>Silvercrest Multimedia Wireless</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="184"/>
+        <source>SteelSeries Apex 300 (Apex RAW)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="185"/>
+        <source>Sun Type 6 (Japanese)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="186"/>
+        <source>Sun Type 6 USB (Japanese)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="187"/>
+        <source>Sun Type 6 USB (Unix)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="188"/>
+        <source>Sun Type 6/7 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="189"/>
+        <source>Sun Type 6/7 USB (European)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="190"/>
+        <source>Sun Type 7 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="191"/>
+        <source>Sun Type 7 USB (European)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="192"/>
+        <source>Sun Type 7 USB (Japanese)/Japanese 106-key</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="193"/>
+        <source>Sun Type 7 USB (Unix)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="194"/>
+        <source>Super Power Multimedia</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="195"/>
+        <source>Symplon PaceBook tablet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="196"/>
+        <source>Targa Visionary 811</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="197"/>
+        <source>Toshiba Satellite S3000</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="198"/>
+        <source>Truly Ergonomic 227</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="199"/>
+        <source>Truly Ergonomic 229</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="200"/>
+        <source>Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="201"/>
+        <source>Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="202"/>
+        <source>Trust Direct Access</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="203"/>
+        <source>Trust Slimline</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="204"/>
+        <source>Trust Wireless Classic</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="205"/>
+        <source>TypeMatrix EZ-Reach 2020</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="206"/>
+        <source>TypeMatrix EZ-Reach 2030 PS2</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="207"/>
+        <source>TypeMatrix EZ-Reach 2030 USB</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="208"/>
+        <source>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="209"/>
+        <source>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="210"/>
+        <source>Unitek KB-1925</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="211"/>
+        <source>ViewSonic KU-306 Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="212"/>
+        <source>Winbook Model XP5</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="213"/>
+        <source>Yahoo! Internet</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="214"/>
+        <source>eMachines m6800 laptop</source>
+        <comment>kb_models</comment>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>kb_variants</name>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="342"/>
         <source>Akan</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="332"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="343"/>
         <source>Albanian (Plisi)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="333"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="344"/>
         <source>Albanian (Veqilharxhi)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="334"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="345"/>
         <source>Arabic (AZERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="335"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="346"/>
         <source>Arabic (AZERTY, Eastern Arabic numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="336"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="347"/>
         <source>Arabic (Algeria)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="337"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="348"/>
         <source>Arabic (Buckwalter)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="338"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="349"/>
         <source>Arabic (Eastern Arabic numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="339"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="350"/>
         <source>Arabic (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="340"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="351"/>
         <source>Arabic (OLPC)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="341"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="352"/>
         <source>Arabic (Pakistan)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="342"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="353"/>
         <source>Arabic (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="343"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="354"/>
         <source>Arabic (QWERTY, Eastern Arabic numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="344"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="355"/>
         <source>Armenian (alt. eastern)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="345"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="356"/>
         <source>Armenian (alt. phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="346"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="357"/>
         <source>Armenian (eastern)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="347"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="358"/>
         <source>Armenian (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="348"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="359"/>
         <source>Armenian (western)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="349"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="360"/>
         <source>Asturian (Spain, with bottom-dot H and L)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="350"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="361"/>
         <source>Avatime</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="351"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="362"/>
         <source>Azerbaijani (Cyrillic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="352"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="363"/>
         <source>Bangla (India)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="353"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="364"/>
         <source>Bangla (India, Baishakhi Inscript)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="354"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="365"/>
         <source>Bangla (India, Baishakhi)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="355"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="366"/>
         <source>Bangla (India, Bornona)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="356"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="367"/>
         <source>Bangla (India, Gitanjali)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="357"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="368"/>
         <source>Bangla (India, Probhat)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="358"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="369"/>
         <source>Bangla (Probhat)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="359"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="370"/>
         <source>Bashkirian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="360"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="371"/>
         <source>Belarusian (Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="361"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="372"/>
         <source>Belarusian (intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="362"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="373"/>
         <source>Belarusian (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="363"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="374"/>
         <source>Belgian (ISO, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="364"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="375"/>
         <source>Belgian (Latin-9 only, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="365"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="376"/>
         <source>Belgian (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="366"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="377"/>
         <source>Belgian (Sun dead keys, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="367"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="378"/>
         <source>Belgian (Wang 724 AZERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="368"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="379"/>
         <source>Belgian (alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="369"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="380"/>
         <source>Belgian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="370"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="381"/>
         <source>Berber (Morocco, Tifinagh alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="371"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="382"/>
         <source>Berber (Morocco, Tifinagh extended phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="372"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="383"/>
         <source>Berber (Morocco, Tifinagh extended)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="373"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="384"/>
         <source>Berber (Morocco, Tifinagh phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="374"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="385"/>
         <source>Berber (Morocco, Tifinagh phonetic, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="375"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="386"/>
         <source>Berber (Morocco, Tifinagh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="376"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="387"/>
         <source>Bosnian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="377"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="388"/>
         <source>Bosnian (US, with Bosnian digraphs)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="378"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="389"/>
         <source>Bosnian (with Bosnian digraphs)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="379"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="390"/>
         <source>Bosnian (with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="380"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="391"/>
         <source>Braille (left-handed inverted thumb)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="381"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="392"/>
         <source>Braille (left-handed)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="382"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="393"/>
         <source>Braille (right-handed inverted thumb)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="383"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="394"/>
         <source>Braille (right-handed)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="384"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="395"/>
         <source>Bulgarian (enhanced)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="385"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="396"/>
         <source>Bulgarian (new phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="386"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="397"/>
         <source>Bulgarian (traditional phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="387"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="398"/>
         <source>Burmese Zawgyi</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="388"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="399"/>
         <source>Cameroon (AZERTY, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="389"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="400"/>
         <source>Cameroon (Dvorak, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="390"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="401"/>
         <source>Cameroon Multilingual (QWERTY, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="391"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="402"/>
         <source>Canadian (intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="392"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="403"/>
         <source>Canadian (intl., 1st part)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="393"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="404"/>
         <source>Canadian (intl., 2nd part)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="394"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="405"/>
         <source>Catalan (Spain, with middle-dot L)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="395"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="406"/>
         <source>Cherokee</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="396"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="407"/>
         <source>Chuvash</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="397"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="408"/>
         <source>Chuvash (Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="398"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="409"/>
         <source>CloGaelach</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="399"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="410"/>
         <source>Crimean Tatar (Turkish Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="400"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="411"/>
         <source>Crimean Tatar (Turkish F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="401"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="412"/>
         <source>Crimean Tatar (Turkish Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="402"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="413"/>
         <source>Croatian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="403"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="414"/>
         <source>Croatian (US, with Croatian digraphs)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="404"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="415"/>
         <source>Croatian (with Croatian digraphs)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="405"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="416"/>
         <source>Croatian (with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="406"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="417"/>
         <source>Czech (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="407"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="418"/>
         <source>Czech (QWERTY, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="408"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="419"/>
         <source>Czech (QWERTY, extended backslash)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="409"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="420"/>
         <source>Czech (UCW, only accented letters)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="410"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="421"/>
         <source>Czech (US, Dvorak, UCW support)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="411"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="422"/>
         <source>Czech (with &amp;lt;|&amp;gt; key)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="412"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="423"/>
         <source>Danish (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="413"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="424"/>
         <source>Danish (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="414"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="425"/>
         <source>Danish (Macintosh, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="415"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="426"/>
         <source>Danish (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="416"/>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="427"/>
         <source>Danish (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="417"/>
-        <source>Dutch (Macintosh)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="418"/>
-        <source>Dutch (Sun dead keys)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="419"/>
-        <source>Dutch (standard)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="420"/>
-        <source>English (Canada)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="421"/>
-        <source>English (Colemak)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="422"/>
-        <source>English (Dvorak)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="423"/>
-        <source>English (Dvorak, alt. intl.)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="424"/>
-        <source>English (Dvorak, intl., with dead keys)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="425"/>
-        <source>English (Dvorak, left-handed)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="426"/>
-        <source>English (Dvorak, right-handed)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="427"/>
-        <source>English (Ghana, GILLBT)</source>
-        <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="428"/>
-        <source>English (Ghana, multilingual)</source>
+        <source>Default</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="429"/>
-        <source>English (India, with rupee)</source>
+        <source>Dutch (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="430"/>
-        <source>English (Macintosh)</source>
+        <source>Dutch (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="431"/>
-        <source>English (Mali, US, Macintosh)</source>
+        <source>Dutch (standard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="432"/>
-        <source>English (Mali, US, intl.)</source>
+        <source>English (Canada)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="433"/>
-        <source>English (Norman)</source>
+        <source>English (Colemak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="434"/>
-        <source>English (UK, Colemak)</source>
+        <source>English (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="435"/>
-        <source>English (UK, Dvorak)</source>
+        <source>English (Dvorak, alt. intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="436"/>
-        <source>English (UK, Dvorak, with UK punctuation)</source>
+        <source>English (Dvorak, intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="437"/>
-        <source>English (UK, Macintosh)</source>
+        <source>English (Dvorak, left-handed)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="438"/>
-        <source>English (UK, Macintosh, intl.)</source>
+        <source>English (Dvorak, right-handed)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="439"/>
-        <source>English (UK, extended, Windows)</source>
+        <source>English (Ghana, GILLBT)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="440"/>
-        <source>English (UK, intl., with dead keys)</source>
+        <source>English (Ghana, multilingual)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="441"/>
-        <source>English (US, Symbolic)</source>
+        <source>English (India, with rupee)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="442"/>
-        <source>English (US, alt. intl.)</source>
+        <source>English (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="443"/>
-        <source>English (US, euro on 5)</source>
+        <source>English (Mali, US, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="444"/>
-        <source>English (US, intl., with dead keys)</source>
+        <source>English (Mali, US, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="445"/>
-        <source>English (Workman)</source>
+        <source>English (Norman)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="446"/>
-        <source>English (Workman, intl., with dead keys)</source>
+        <source>English (UK, Colemak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="447"/>
-        <source>English (classic Dvorak)</source>
+        <source>English (UK, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="448"/>
-        <source>English (intl., with AltGr dead keys)</source>
+        <source>English (UK, Dvorak, with UK punctuation)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="449"/>
-        <source>English (programmer Dvorak)</source>
+        <source>English (UK, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="450"/>
-        <source>English (the divide/multiply toggle the layout)</source>
+        <source>English (UK, Macintosh, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="451"/>
-        <source>Esperanto (Brazil, Nativo)</source>
+        <source>English (UK, extended, Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="452"/>
-        <source>Esperanto (Portugal, Nativo)</source>
+        <source>English (UK, intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="453"/>
-        <source>Esperanto (legacy)</source>
+        <source>English (US, Symbolic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="454"/>
-        <source>Estonian (Dvorak)</source>
+        <source>English (US, alt. intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="455"/>
-        <source>Estonian (US)</source>
+        <source>English (US, euro on 5)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="456"/>
-        <source>Estonian (no dead keys)</source>
+        <source>English (US, intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="457"/>
-        <source>Ewe</source>
+        <source>English (Workman)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="458"/>
-        <source>Faroese (no dead keys)</source>
+        <source>English (Workman, intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="459"/>
-        <source>Filipino (Capewell-Dvorak, Baybayin)</source>
+        <source>English (classic Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="460"/>
-        <source>Filipino (Capewell-Dvorak, Latin)</source>
+        <source>English (intl., with AltGr dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="461"/>
-        <source>Filipino (Capewell-QWERF 2006, Baybayin)</source>
+        <source>English (programmer Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="462"/>
-        <source>Filipino (Capewell-QWERF 2006, Latin)</source>
+        <source>English (the divide/multiply toggle the layout)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="463"/>
-        <source>Filipino (Colemak, Baybayin)</source>
+        <source>Esperanto (Brazil, Nativo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="464"/>
-        <source>Filipino (Colemak, Latin)</source>
+        <source>Esperanto (Portugal, Nativo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="465"/>
-        <source>Filipino (Dvorak, Baybayin)</source>
+        <source>Esperanto (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="466"/>
-        <source>Filipino (Dvorak, Latin)</source>
+        <source>Estonian (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="467"/>
-        <source>Filipino (QWERTY, Baybayin)</source>
+        <source>Estonian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="468"/>
-        <source>Finnish (Macintosh)</source>
+        <source>Estonian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="469"/>
-        <source>Finnish (Windows)</source>
+        <source>Ewe</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="470"/>
-        <source>Finnish (classic)</source>
+        <source>Faroese (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="471"/>
-        <source>Finnish (classic, no dead keys)</source>
+        <source>Filipino (Capewell-Dvorak, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="472"/>
-        <source>French (AZERTY)</source>
+        <source>Filipino (Capewell-Dvorak, Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="473"/>
-        <source>French (AZERTY, AFNOR)</source>
+        <source>Filipino (Capewell-QWERF 2006, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="474"/>
-        <source>French (BEPO)</source>
+        <source>Filipino (Capewell-QWERF 2006, Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="475"/>
-        <source>French (BEPO, AFNOR)</source>
+        <source>Filipino (Colemak, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="476"/>
-        <source>French (BEPO, Latin-9 only)</source>
+        <source>Filipino (Colemak, Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="477"/>
-        <source>French (Breton)</source>
+        <source>Filipino (Dvorak, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="478"/>
-        <source>French (Cameroon)</source>
+        <source>Filipino (Dvorak, Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="479"/>
-        <source>French (Canada, Dvorak)</source>
+        <source>Filipino (QWERTY, Baybayin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="480"/>
-        <source>French (Canada, legacy)</source>
+        <source>Finnish (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="481"/>
-        <source>French (Dvorak)</source>
+        <source>Finnish (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="482"/>
-        <source>French (Macintosh)</source>
+        <source>Finnish (classic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="483"/>
-        <source>French (Mali, alt.)</source>
+        <source>Finnish (classic, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="484"/>
-        <source>French (Morocco)</source>
+        <source>French (AZERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="485"/>
-        <source>French (Sun dead keys)</source>
+        <source>French (AZERTY, AFNOR)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="486"/>
-        <source>French (Switzerland)</source>
+        <source>French (BEPO)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="487"/>
-        <source>French (Switzerland, Macintosh)</source>
+        <source>French (BEPO, AFNOR)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="488"/>
-        <source>French (Switzerland, Sun dead keys)</source>
+        <source>French (BEPO, Latin-9 only)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="489"/>
-        <source>French (Switzerland, no dead keys)</source>
+        <source>French (Breton)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="490"/>
-        <source>French (US)</source>
+        <source>French (Cameroon)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="491"/>
-        <source>French (alt.)</source>
+        <source>French (Canada, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="492"/>
-        <source>French (alt., Latin-9 only)</source>
+        <source>French (Canada, legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="493"/>
-        <source>French (alt., Sun dead keys)</source>
+        <source>French (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="494"/>
-        <source>French (alt., no dead keys)</source>
+        <source>French (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="495"/>
-        <source>French (legacy, alt.)</source>
+        <source>French (Mali, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="496"/>
-        <source>French (legacy, alt., Sun dead keys)</source>
+        <source>French (Morocco)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="497"/>
-        <source>French (legacy, alt., no dead keys)</source>
+        <source>French (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="498"/>
-        <source>French (no dead keys)</source>
+        <source>French (Switzerland)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="499"/>
-        <source>Friulian (Italy)</source>
+        <source>French (Switzerland, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="500"/>
-        <source>Fula</source>
+        <source>French (Switzerland, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="501"/>
-        <source>Ga</source>
+        <source>French (Switzerland, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="502"/>
-        <source>Georgian (France, AZERTY Tskapo)</source>
+        <source>French (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="503"/>
-        <source>Georgian (Italy)</source>
+        <source>French (alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="504"/>
-        <source>Georgian (MESS)</source>
+        <source>French (alt., Latin-9 only)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="505"/>
-        <source>Georgian (ergonomic)</source>
+        <source>French (alt., Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="506"/>
-        <source>German (Austria, Macintosh)</source>
+        <source>French (alt., no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="507"/>
-        <source>German (Austria, Sun dead keys)</source>
+        <source>French (legacy, alt.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="508"/>
-        <source>German (Austria, no dead keys)</source>
+        <source>French (legacy, alt., Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="509"/>
-        <source>German (Dvorak)</source>
+        <source>French (legacy, alt., no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="510"/>
-        <source>German (E1)</source>
+        <source>French (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="511"/>
-        <source>German (E2)</source>
+        <source>Friulian (Italy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="512"/>
-        <source>German (Macintosh)</source>
+        <source>Fula</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="513"/>
-        <source>German (Macintosh, no dead keys)</source>
+        <source>Ga</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="514"/>
-        <source>German (Neo 2)</source>
+        <source>Georgian (France, AZERTY Tskapo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="515"/>
-        <source>German (QWERTY)</source>
+        <source>Georgian (Italy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="516"/>
-        <source>German (Sun dead keys)</source>
+        <source>Georgian (MESS)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="517"/>
-        <source>German (Switzerland, Macintosh)</source>
+        <source>Georgian (ergonomic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="518"/>
-        <source>German (Switzerland, Sun dead keys)</source>
+        <source>German (Austria, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="519"/>
-        <source>German (Switzerland, legacy)</source>
+        <source>German (Austria, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="520"/>
-        <source>German (Switzerland, no dead keys)</source>
+        <source>German (Austria, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="521"/>
-        <source>German (T3)</source>
+        <source>German (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="522"/>
-        <source>German (US)</source>
+        <source>German (E1)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="523"/>
-        <source>German (dead acute)</source>
+        <source>German (E2)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="524"/>
-        <source>German (dead grave acute)</source>
+        <source>German (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="525"/>
-        <source>German (dead tilde)</source>
+        <source>German (Macintosh, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="526"/>
-        <source>German (no dead keys)</source>
+        <source>German (Neo 2)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="527"/>
-        <source>Greek (extended)</source>
+        <source>German (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="528"/>
-        <source>Greek (no dead keys)</source>
+        <source>German (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="529"/>
-        <source>Greek (polytonic)</source>
+        <source>German (Switzerland, Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="530"/>
-        <source>Greek (simple)</source>
+        <source>German (Switzerland, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="531"/>
-        <source>Gujarati</source>
+        <source>German (Switzerland, legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="532"/>
-        <source>Hanyu Pinyin (with AltGr dead keys)</source>
+        <source>German (Switzerland, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="533"/>
-        <source>Hausa (Ghana)</source>
+        <source>German (T3)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="534"/>
-        <source>Hausa (Nigeria)</source>
+        <source>German (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="535"/>
-        <source>Hawaiian</source>
+        <source>German (dead acute)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="536"/>
-        <source>Hebrew (Biblical, Tiro)</source>
+        <source>German (dead grave acute)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="537"/>
-        <source>Hebrew (lyx)</source>
+        <source>German (dead tilde)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="538"/>
-        <source>Hebrew (phonetic)</source>
+        <source>German (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="539"/>
-        <source>Hindi (Bolnagri)</source>
+        <source>Greek (extended)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="540"/>
-        <source>Hindi (KaGaPa, phonetic)</source>
+        <source>Greek (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="541"/>
-        <source>Hindi (Wx)</source>
+        <source>Greek (polytonic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="542"/>
-        <source>Hungarian (QWERTY)</source>
+        <source>Greek (simple)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="543"/>
-        <source>Hungarian (QWERTY, 101-key, comma, dead keys)</source>
+        <source>Gujarati</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="544"/>
-        <source>Hungarian (QWERTY, 101-key, comma, no dead keys)</source>
+        <source>Hanyu Pinyin (with AltGr dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="545"/>
-        <source>Hungarian (QWERTY, 101-key, dot, dead keys)</source>
+        <source>Hausa (Ghana)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="546"/>
-        <source>Hungarian (QWERTY, 101-key, dot, no dead keys)</source>
+        <source>Hausa (Nigeria)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="547"/>
-        <source>Hungarian (QWERTY, 102-key, comma, dead keys)</source>
+        <source>Hawaiian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="548"/>
-        <source>Hungarian (QWERTY, 102-key, comma, no dead keys)</source>
+        <source>Hebrew (Biblical, Tiro)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="549"/>
-        <source>Hungarian (QWERTY, 102-key, dot, dead keys)</source>
+        <source>Hebrew (lyx)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="550"/>
-        <source>Hungarian (QWERTY, 102-key, dot, no dead keys)</source>
+        <source>Hebrew (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="551"/>
-        <source>Hungarian (QWERTZ, 101-key, comma, dead keys)</source>
+        <source>Hindi (Bolnagri)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="552"/>
-        <source>Hungarian (QWERTZ, 101-key, comma, no dead keys)</source>
+        <source>Hindi (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="553"/>
-        <source>Hungarian (QWERTZ, 101-key, dot, dead keys)</source>
+        <source>Hindi (Wx)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="554"/>
-        <source>Hungarian (QWERTZ, 101-key, dot, no dead keys)</source>
+        <source>Hungarian (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="555"/>
-        <source>Hungarian (QWERTZ, 102-key, comma, dead keys)</source>
+        <source>Hungarian (QWERTY, 101-key, comma, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="556"/>
-        <source>Hungarian (QWERTZ, 102-key, comma, no dead keys)</source>
+        <source>Hungarian (QWERTY, 101-key, comma, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="557"/>
-        <source>Hungarian (QWERTZ, 102-key, dot, dead keys)</source>
+        <source>Hungarian (QWERTY, 101-key, dot, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="558"/>
-        <source>Hungarian (QWERTZ, 102-key, dot, no dead keys)</source>
+        <source>Hungarian (QWERTY, 101-key, dot, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="559"/>
-        <source>Hungarian (no dead keys)</source>
+        <source>Hungarian (QWERTY, 102-key, comma, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="560"/>
-        <source>Hungarian (standard)</source>
+        <source>Hungarian (QWERTY, 102-key, comma, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="561"/>
-        <source>Icelandic (Dvorak)</source>
+        <source>Hungarian (QWERTY, 102-key, dot, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="562"/>
-        <source>Icelandic (Macintosh)</source>
+        <source>Hungarian (QWERTY, 102-key, dot, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="563"/>
-        <source>Icelandic (Macintosh, legacy)</source>
+        <source>Hungarian (QWERTZ, 101-key, comma, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="564"/>
-        <source>Icelandic (Sun dead keys)</source>
+        <source>Hungarian (QWERTZ, 101-key, comma, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="565"/>
-        <source>Icelandic (no dead keys)</source>
+        <source>Hungarian (QWERTZ, 101-key, dot, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="566"/>
-        <source>Igbo</source>
+        <source>Hungarian (QWERTZ, 101-key, dot, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="567"/>
-        <source>Indic (phonetic, IPA)</source>
+        <source>Hungarian (QWERTZ, 102-key, comma, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="568"/>
-        <source>Indonesian (Arab Melayu, extended phonetic)</source>
+        <source>Hungarian (QWERTZ, 102-key, comma, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="569"/>
-        <source>Inuktitut</source>
+        <source>Hungarian (QWERTZ, 102-key, dot, dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="570"/>
-        <source>Irish (UnicodeExpert)</source>
+        <source>Hungarian (QWERTZ, 102-key, dot, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="571"/>
-        <source>Italian (IBM 142)</source>
+        <source>Hungarian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="572"/>
-        <source>Italian (Macintosh)</source>
+        <source>Hungarian (standard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="573"/>
-        <source>Italian (US)</source>
+        <source>Icelandic (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="574"/>
-        <source>Italian (Windows)</source>
+        <source>Icelandic (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="575"/>
-        <source>Italian (intl., with dead keys)</source>
+        <source>Icelandic (Macintosh, legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="576"/>
-        <source>Italian (no dead keys)</source>
+        <source>Icelandic (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="577"/>
-        <source>Japanese (Dvorak)</source>
+        <source>Icelandic (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="578"/>
-        <source>Japanese (Kana 86)</source>
+        <source>Igbo</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="579"/>
-        <source>Japanese (Kana)</source>
+        <source>Indic (phonetic, IPA)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="580"/>
-        <source>Japanese (Macintosh)</source>
+        <source>Indonesian (Arab Melayu, extended phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="581"/>
-        <source>Japanese (OADG 109A)</source>
+        <source>Inuktitut</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="582"/>
-        <source>Kabylian (Algeria, Tifinagh)</source>
+        <source>Irish (UnicodeExpert)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="583"/>
-        <source>Kabylian (azerty layout, with dead keys)</source>
+        <source>Italian (IBM 142)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="584"/>
-        <source>Kabylian (qwerty-gb layout, with dead keys)</source>
+        <source>Italian (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="585"/>
-        <source>Kabylian (qwerty-us layout, with dead keys)</source>
+        <source>Italian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="586"/>
-        <source>Kalmyk</source>
+        <source>Italian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="587"/>
-        <source>Kannada</source>
+        <source>Italian (intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="588"/>
-        <source>Kannada (KaGaPa, phonetic)</source>
+        <source>Italian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="589"/>
-        <source>Kashubian</source>
+        <source>Japanese (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="590"/>
-        <source>Kazakh (Latin)</source>
+        <source>Japanese (Kana 86)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="591"/>
-        <source>Kazakh (extended)</source>
+        <source>Japanese (Kana)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="592"/>
-        <source>Kazakh (with Russian)</source>
+        <source>Japanese (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="593"/>
-        <source>Kikuyu</source>
+        <source>Japanese (OADG 109A)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="594"/>
-        <source>Komi</source>
+        <source>Kabylian (Algeria, Tifinagh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="595"/>
-        <source>Korean (101/104-key compatible)</source>
+        <source>Kabylian (azerty layout, with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="596"/>
-        <source>Kurdish (Iran, Arabic-Latin)</source>
+        <source>Kabylian (qwerty-gb layout, with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="597"/>
-        <source>Kurdish (Iran, F)</source>
+        <source>Kabylian (qwerty-us layout, with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="598"/>
-        <source>Kurdish (Iran, Latin Alt-Q)</source>
+        <source>Kalmyk</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="599"/>
-        <source>Kurdish (Iran, Latin Q)</source>
+        <source>Kannada</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="600"/>
-        <source>Kurdish (Iraq, Arabic-Latin)</source>
+        <source>Kannada (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="601"/>
-        <source>Kurdish (Iraq, F)</source>
+        <source>Kashubian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="602"/>
-        <source>Kurdish (Iraq, Latin Alt-Q)</source>
+        <source>Kazakh (Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="603"/>
-        <source>Kurdish (Iraq, Latin Q)</source>
+        <source>Kazakh (extended)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="604"/>
-        <source>Kurdish (Syria, F)</source>
+        <source>Kazakh (with Russian)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="605"/>
-        <source>Kurdish (Syria, Latin Alt-Q)</source>
+        <source>Kikuyu</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="606"/>
-        <source>Kurdish (Syria, Latin Q)</source>
+        <source>Komi</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="607"/>
-        <source>Kurdish (Turkey, F)</source>
+        <source>Korean (101/104-key compatible)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="608"/>
-        <source>Kurdish (Turkey, Latin Alt-Q)</source>
+        <source>Kurdish (Iran, Arabic-Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="609"/>
-        <source>Kurdish (Turkey, Latin Q)</source>
+        <source>Kurdish (Iran, F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="610"/>
-        <source>Kyrgyz (phonetic)</source>
+        <source>Kurdish (Iran, Latin Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="611"/>
-        <source>Lao (STEA)</source>
+        <source>Kurdish (Iran, Latin Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="612"/>
-        <source>Latvian (F)</source>
+        <source>Kurdish (Iraq, Arabic-Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="613"/>
-        <source>Latvian (adapted)</source>
+        <source>Kurdish (Iraq, F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="614"/>
-        <source>Latvian (apostrophe)</source>
+        <source>Kurdish (Iraq, Latin Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="615"/>
-        <source>Latvian (ergonomic, ŪGJRMV)</source>
+        <source>Kurdish (Iraq, Latin Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="616"/>
-        <source>Latvian (modern)</source>
+        <source>Kurdish (Syria, F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="617"/>
-        <source>Latvian (tilde)</source>
+        <source>Kurdish (Syria, Latin Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="618"/>
-        <source>Lithuanian (IBM LST 1205-92)</source>
+        <source>Kurdish (Syria, Latin Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="619"/>
-        <source>Lithuanian (LEKP)</source>
+        <source>Kurdish (Turkey, F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="620"/>
-        <source>Lithuanian (LEKPa)</source>
+        <source>Kurdish (Turkey, Latin Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="621"/>
-        <source>Lithuanian (US)</source>
+        <source>Kurdish (Turkey, Latin Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="622"/>
-        <source>Lithuanian (standard)</source>
+        <source>Kyrgyz (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="623"/>
-        <source>Lower Sorbian</source>
+        <source>Lao (STEA)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="624"/>
-        <source>Lower Sorbian (QWERTZ)</source>
+        <source>Latvian (F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="625"/>
-        <source>Macedonian (no dead keys)</source>
+        <source>Latvian (adapted)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="626"/>
-        <source>Malay (Jawi, phonetic)</source>
+        <source>Latvian (apostrophe)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="627"/>
-        <source>Malayalam</source>
+        <source>Latvian (ergonomic, ŪGJRMV)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="628"/>
-        <source>Malayalam (Lalitha)</source>
+        <source>Latvian (modern)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="629"/>
-        <source>Malayalam (enhanced Inscript, with rupee)</source>
+        <source>Latvian (tilde)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="630"/>
-        <source>Maltese (UK, with AltGr overrides)</source>
+        <source>Lithuanian (IBM LST 1205-92)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="631"/>
-        <source>Maltese (US layout with AltGr overrides)</source>
+        <source>Lithuanian (LEKP)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="632"/>
-        <source>Maltese (US)</source>
+        <source>Lithuanian (LEKPa)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="633"/>
-        <source>Manipuri (Eeyek)</source>
+        <source>Lithuanian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="634"/>
-        <source>Marathi (KaGaPa, phonetic)</source>
+        <source>Lithuanian (standard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="635"/>
-        <source>Marathi (enhanced Inscript)</source>
+        <source>Lower Sorbian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="636"/>
-        <source>Mari</source>
+        <source>Lower Sorbian (QWERTZ)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="637"/>
-        <source>Mmuock</source>
+        <source>Macedonian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="638"/>
-        <source>Moldavian (Gagauz)</source>
+        <source>Malay (Jawi, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="639"/>
-        <source>Mongolian (Bichig)</source>
+        <source>Malayalam</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="640"/>
-        <source>Mongolian (Galik)</source>
+        <source>Malayalam (Lalitha)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="641"/>
-        <source>Mongolian (Manchu Galik)</source>
+        <source>Malayalam (enhanced Inscript, with rupee)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="642"/>
-        <source>Mongolian (Manchu)</source>
+        <source>Maltese (UK, with AltGr overrides)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="643"/>
-        <source>Mongolian (Todo Galik)</source>
+        <source>Maltese (US layout with AltGr overrides)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="644"/>
-        <source>Mongolian (Todo)</source>
+        <source>Maltese (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="645"/>
-        <source>Mongolian (Xibe)</source>
+        <source>Manipuri (Eeyek)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="646"/>
-        <source>Montenegrin (Cyrillic)</source>
+        <source>Marathi (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="647"/>
-        <source>Montenegrin (Cyrillic, ZE and ZHE swapped)</source>
+        <source>Marathi (enhanced Inscript)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="648"/>
-        <source>Montenegrin (Cyrillic, with guillemets)</source>
+        <source>Mari</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="649"/>
-        <source>Montenegrin (Latin, QWERTY)</source>
+        <source>Mmuock</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="650"/>
-        <source>Montenegrin (Latin, Unicode)</source>
+        <source>Moldavian (Gagauz)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="651"/>
-        <source>Montenegrin (Latin, Unicode, QWERTY)</source>
+        <source>Mongolian (Bichig)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="652"/>
-        <source>Montenegrin (Latin, with guillemets)</source>
+        <source>Mongolian (Galik)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="653"/>
-        <source>Northern Saami (Finland)</source>
+        <source>Mongolian (Manchu Galik)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="654"/>
-        <source>Northern Saami (Norway)</source>
+        <source>Mongolian (Manchu)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="655"/>
-        <source>Northern Saami (Norway, no dead keys)</source>
+        <source>Mongolian (Todo Galik)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="656"/>
-        <source>Northern Saami (Sweden)</source>
+        <source>Mongolian (Todo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="657"/>
-        <source>Norwegian (Colemak)</source>
+        <source>Mongolian (Xibe)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="658"/>
-        <source>Norwegian (Dvorak)</source>
+        <source>Montenegrin (Cyrillic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="659"/>
-        <source>Norwegian (Macintosh)</source>
+        <source>Montenegrin (Cyrillic, ZE and ZHE swapped)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="660"/>
-        <source>Norwegian (Macintosh, no dead keys)</source>
+        <source>Montenegrin (Cyrillic, with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="661"/>
-        <source>Norwegian (Windows)</source>
+        <source>Montenegrin (Latin, QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="662"/>
-        <source>Norwegian (no dead keys)</source>
+        <source>Montenegrin (Latin, Unicode)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="663"/>
-        <source>Occitan</source>
+        <source>Montenegrin (Latin, Unicode, QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="664"/>
-        <source>Ogham</source>
+        <source>Montenegrin (Latin, with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="665"/>
-        <source>Ogham (IS434)</source>
+        <source>Northern Saami (Finland)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="666"/>
-        <source>Ol Chiki</source>
+        <source>Northern Saami (Norway)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="667"/>
-        <source>Oriya</source>
+        <source>Northern Saami (Norway, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="668"/>
-        <source>Ossetian (Georgia)</source>
+        <source>Northern Saami (Sweden)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="669"/>
-        <source>Ossetian (Windows)</source>
+        <source>Norwegian (Colemak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="670"/>
-        <source>Ossetian (legacy)</source>
+        <source>Norwegian (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="671"/>
-        <source>Pannonian Rusyn</source>
+        <source>Norwegian (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="672"/>
-        <source>Pashto</source>
+        <source>Norwegian (Macintosh, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="673"/>
-        <source>Pashto (Afghanistan, OLPC)</source>
+        <source>Norwegian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="674"/>
-        <source>Persian (Afghanistan, Dari OLPC)</source>
+        <source>Norwegian (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="675"/>
-        <source>Persian (with Persian keypad)</source>
+        <source>Occitan</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="676"/>
-        <source>Polish (British keyboard)</source>
+        <source>Ogham</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="677"/>
-        <source>Polish (Dvorak)</source>
+        <source>Ogham (IS434)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="678"/>
-        <source>Polish (Dvorak, with Polish quotes on key 1)</source>
+        <source>Ol Chiki</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="679"/>
-        <source>Polish (Dvorak, with Polish quotes on quotemark key)</source>
+        <source>Oriya</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="680"/>
-        <source>Polish (QWERTZ)</source>
+        <source>Ossetian (Georgia)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="681"/>
-        <source>Polish (legacy)</source>
+        <source>Ossetian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="682"/>
-        <source>Polish (programmer Dvorak)</source>
+        <source>Ossetian (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="683"/>
-        <source>Portuguese (Brazil, Dvorak)</source>
+        <source>Pannonian Rusyn</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="684"/>
-        <source>Portuguese (Brazil, IBM/Lenovo ThinkPad)</source>
+        <source>Pashto</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="685"/>
-        <source>Portuguese (Brazil, Nativo for US keyboards)</source>
+        <source>Pashto (Afghanistan, OLPC)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="686"/>
-        <source>Portuguese (Brazil, Nativo)</source>
+        <source>Persian (Afghanistan, Dari OLPC)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="687"/>
-        <source>Portuguese (Brazil, no dead keys)</source>
+        <source>Persian (with Persian keypad)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="688"/>
-        <source>Portuguese (Macintosh)</source>
+        <source>Polish (British keyboard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="689"/>
-        <source>Portuguese (Macintosh, Sun dead keys)</source>
+        <source>Polish (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="690"/>
-        <source>Portuguese (Macintosh, no dead keys)</source>
+        <source>Polish (Dvorak, with Polish quotes on key 1)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="691"/>
-        <source>Portuguese (Nativo for US keyboards)</source>
+        <source>Polish (Dvorak, with Polish quotes on quotemark key)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="692"/>
-        <source>Portuguese (Nativo)</source>
+        <source>Polish (QWERTZ)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="693"/>
-        <source>Portuguese (Sun dead keys)</source>
+        <source>Polish (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="694"/>
-        <source>Portuguese (no dead keys)</source>
+        <source>Polish (programmer Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="695"/>
-        <source>Punjabi (Gurmukhi Jhelum)</source>
+        <source>Portuguese (Brazil, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="696"/>
-        <source>Punjabi (Gurmukhi)</source>
+        <source>Portuguese (Brazil, IBM/Lenovo ThinkPad)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="697"/>
-        <source>Romanian (Germany)</source>
+        <source>Portuguese (Brazil, Nativo for US keyboards)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="698"/>
-        <source>Romanian (Germany, no dead keys)</source>
+        <source>Portuguese (Brazil, Nativo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="699"/>
-        <source>Romanian (Windows)</source>
+        <source>Portuguese (Brazil, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="700"/>
-        <source>Romanian (cedilla)</source>
+        <source>Portuguese (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="701"/>
-        <source>Romanian (standard cedilla)</source>
+        <source>Portuguese (Macintosh, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="702"/>
-        <source>Romanian (standard)</source>
+        <source>Portuguese (Macintosh, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="703"/>
-        <source>Russian (Belarus)</source>
+        <source>Portuguese (Nativo for US keyboards)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="704"/>
-        <source>Russian (Czech, phonetic)</source>
+        <source>Portuguese (Nativo)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="705"/>
-        <source>Russian (DOS)</source>
+        <source>Portuguese (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="706"/>
-        <source>Russian (Georgia)</source>
+        <source>Portuguese (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="707"/>
-        <source>Russian (Germany, phonetic)</source>
+        <source>Punjabi (Gurmukhi Jhelum)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="708"/>
-        <source>Russian (Kazakhstan, with Kazakh)</source>
+        <source>Punjabi (Gurmukhi)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="709"/>
-        <source>Russian (Macintosh)</source>
+        <source>Romanian (Germany)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="710"/>
-        <source>Russian (Poland, phonetic Dvorak)</source>
+        <source>Romanian (Germany, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="711"/>
-        <source>Russian (Sweden, phonetic)</source>
+        <source>Romanian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="712"/>
-        <source>Russian (Sweden, phonetic, no dead keys)</source>
+        <source>Romanian (cedilla)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="713"/>
-        <source>Russian (US, phonetic)</source>
+        <source>Romanian (standard cedilla)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="714"/>
-        <source>Russian (Ukraine, standard RSTU)</source>
+        <source>Romanian (standard)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="715"/>
-        <source>Russian (legacy)</source>
+        <source>Russian (Belarus)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="716"/>
-        <source>Russian (phonetic)</source>
+        <source>Russian (Czech, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="717"/>
-        <source>Russian (phonetic, AZERTY)</source>
+        <source>Russian (DOS)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="718"/>
-        <source>Russian (phonetic, Dvorak)</source>
+        <source>Russian (Georgia)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="719"/>
-        <source>Russian (phonetic, French)</source>
+        <source>Russian (Germany, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="720"/>
-        <source>Russian (phonetic, Windows)</source>
+        <source>Russian (Kazakhstan, with Kazakh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="721"/>
-        <source>Russian (phonetic, YAZHERTY)</source>
+        <source>Russian (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="722"/>
-        <source>Russian (typewriter)</source>
+        <source>Russian (Poland, phonetic Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="723"/>
-        <source>Russian (typewriter, legacy)</source>
+        <source>Russian (Sweden, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="724"/>
-        <source>Saisiyat (Taiwan)</source>
+        <source>Russian (Sweden, phonetic, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="725"/>
-        <source>Samogitian</source>
+        <source>Russian (US, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="726"/>
-        <source>Sanskrit (KaGaPa, phonetic)</source>
+        <source>Russian (Ukraine, standard RSTU)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="727"/>
-        <source>Serbian (Cyrillic, ZE and ZHE swapped)</source>
+        <source>Russian (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="728"/>
-        <source>Serbian (Cyrillic, with guillemets)</source>
+        <source>Russian (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="729"/>
-        <source>Serbian (Latin)</source>
+        <source>Russian (phonetic, AZERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="730"/>
-        <source>Serbian (Latin, QWERTY)</source>
+        <source>Russian (phonetic, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="731"/>
-        <source>Serbian (Latin, Unicode)</source>
+        <source>Russian (phonetic, French)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="732"/>
-        <source>Serbian (Latin, Unicode, QWERTY)</source>
+        <source>Russian (phonetic, Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="733"/>
-        <source>Serbian (Latin, with guillemets)</source>
+        <source>Russian (phonetic, YAZHERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="734"/>
-        <source>Serbian (Russia)</source>
+        <source>Russian (typewriter)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="735"/>
-        <source>Serbo-Croatian (US)</source>
+        <source>Russian (typewriter, legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="736"/>
-        <source>Sicilian</source>
+        <source>Saisiyat (Taiwan)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="737"/>
-        <source>Silesian</source>
+        <source>Samogitian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="738"/>
-        <source>Sindhi</source>
+        <source>Sanskrit (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="739"/>
-        <source>Sinhala (US)</source>
+        <source>Serbian (Cyrillic, ZE and ZHE swapped)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="740"/>
-        <source>Slovak (QWERTY)</source>
+        <source>Serbian (Cyrillic, with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="741"/>
-        <source>Slovak (QWERTY, extended backslash)</source>
+        <source>Serbian (Latin)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="742"/>
-        <source>Slovak (extended backslash)</source>
+        <source>Serbian (Latin, QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="743"/>
-        <source>Slovenian (US)</source>
+        <source>Serbian (Latin, Unicode)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="744"/>
-        <source>Slovenian (with guillemets)</source>
+        <source>Serbian (Latin, Unicode, QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="745"/>
-        <source>Spanish (Dvorak)</source>
+        <source>Serbian (Latin, with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="746"/>
-        <source>Spanish (Latin American, Colemak for gaming)</source>
+        <source>Serbian (Russia)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="747"/>
-        <source>Spanish (Latin American, Colemak)</source>
+        <source>Serbo-Croatian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="748"/>
-        <source>Spanish (Latin American, Dvorak)</source>
+        <source>Sicilian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="749"/>
-        <source>Spanish (Latin American, Sun dead keys)</source>
+        <source>Silesian</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="750"/>
-        <source>Spanish (Latin American, dead tilde)</source>
+        <source>Sindhi</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="751"/>
-        <source>Spanish (Latin American, no dead keys)</source>
+        <source>Sinhala (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="752"/>
-        <source>Spanish (Macintosh)</source>
+        <source>Slovak (QWERTY)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="753"/>
-        <source>Spanish (Sun dead keys)</source>
+        <source>Slovak (QWERTY, extended backslash)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="754"/>
-        <source>Spanish (Windows)</source>
+        <source>Slovak (extended backslash)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="755"/>
-        <source>Spanish (dead tilde)</source>
+        <source>Slovenian (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="756"/>
-        <source>Spanish (no dead keys)</source>
+        <source>Slovenian (with guillemets)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="757"/>
-        <source>Swedish (Dvorak)</source>
+        <source>Spanish (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="758"/>
-        <source>Swedish (Dvorak, intl.)</source>
+        <source>Spanish (Latin American, Colemak for gaming)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="759"/>
-        <source>Swedish (Macintosh)</source>
+        <source>Spanish (Latin American, Colemak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="760"/>
-        <source>Swedish (Svdvorak)</source>
+        <source>Spanish (Latin American, Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="761"/>
-        <source>Swedish (US)</source>
+        <source>Spanish (Latin American, Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="762"/>
-        <source>Swedish (no dead keys)</source>
+        <source>Spanish (Latin American, dead tilde)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="763"/>
-        <source>Swedish Sign Language</source>
+        <source>Spanish (Latin American, no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="764"/>
-        <source>Syriac</source>
+        <source>Spanish (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="765"/>
-        <source>Syriac (phonetic)</source>
+        <source>Spanish (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="766"/>
-        <source>Taiwanese (indigenous)</source>
+        <source>Spanish (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="767"/>
-        <source>Tajik (legacy)</source>
+        <source>Spanish (dead tilde)</source>
         <comment>kb_variants</comment>
-        <translation>Тоҷикӣ (красіво)</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="768"/>
-        <source>Tamil (Inscript)</source>
+        <source>Spanish (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="769"/>
-        <source>Tamil (Sri Lanka, TamilNet &apos;99)</source>
+        <source>Swedish (Dvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="770"/>
-        <source>Tamil (Sri Lanka, TamilNet &apos;99, TAB encoding)</source>
+        <source>Swedish (Dvorak, intl.)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="771"/>
-        <source>Tamil (TamilNet &apos;99 with Tamil numerals)</source>
+        <source>Swedish (Macintosh)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="772"/>
-        <source>Tamil (TamilNet &apos;99)</source>
+        <source>Swedish (Svdvorak)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="773"/>
-        <source>Tamil (TamilNet &apos;99, TAB encoding)</source>
+        <source>Swedish (US)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="774"/>
-        <source>Tamil (TamilNet &apos;99, TSCII encoding)</source>
+        <source>Swedish (no dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="775"/>
-        <source>Tatar</source>
+        <source>Swedish Sign Language</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="776"/>
-        <source>Telugu</source>
+        <source>Syriac</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="777"/>
-        <source>Telugu (KaGaPa, phonetic)</source>
+        <source>Syriac (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="778"/>
-        <source>Telugu (Sarala)</source>
+        <source>Taiwanese (indigenous)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="779"/>
-        <source>Thai (Pattachote)</source>
+        <source>Tajik (legacy)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Тоҷикӣ (красіво)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="780"/>
-        <source>Thai (TIS-820.2538)</source>
+        <source>Tamil (Inscript)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="781"/>
-        <source>Tibetan</source>
+        <source>Tamil (Sri Lanka, TamilNet &apos;99)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="782"/>
-        <source>Tibetan (with ASCII numerals)</source>
+        <source>Tamil (Sri Lanka, TamilNet &apos;99, TAB encoding)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="783"/>
-        <source>Turkish (Alt-Q)</source>
+        <source>Tamil (TamilNet &apos;99 with Tamil numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="784"/>
-        <source>Turkish (F)</source>
+        <source>Tamil (TamilNet &apos;99)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="785"/>
-        <source>Turkish (Germany)</source>
+        <source>Tamil (TamilNet &apos;99, TAB encoding)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="786"/>
-        <source>Turkish (Sun dead keys)</source>
+        <source>Tamil (TamilNet &apos;99, TSCII encoding)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="787"/>
-        <source>Turkish (intl., with dead keys)</source>
+        <source>Tatar</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="788"/>
-        <source>Turkmen (Alt-Q)</source>
+        <source>Telugu</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="789"/>
-        <source>Udmurt</source>
+        <source>Telugu (KaGaPa, phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="790"/>
-        <source>Ukrainian (Windows)</source>
+        <source>Telugu (Sarala)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="791"/>
-        <source>Ukrainian (homophonic)</source>
+        <source>Thai (Pattachote)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="792"/>
-        <source>Ukrainian (legacy)</source>
+        <source>Thai (TIS-820.2538)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="793"/>
-        <source>Ukrainian (phonetic)</source>
+        <source>Tibetan</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="794"/>
-        <source>Ukrainian (standard RSTU)</source>
+        <source>Tibetan (with ASCII numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="795"/>
-        <source>Ukrainian (typewriter)</source>
+        <source>Turkish (Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="796"/>
-        <source>Urdu (Pakistan, CRULP)</source>
+        <source>Turkish (F)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="797"/>
-        <source>Urdu (Pakistan, NLA)</source>
+        <source>Turkish (Germany)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="798"/>
-        <source>Urdu (Windows)</source>
+        <source>Turkish (Sun dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="799"/>
-        <source>Urdu (alt. phonetic)</source>
+        <source>Turkish (intl., with dead keys)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="800"/>
-        <source>Urdu (phonetic)</source>
+        <source>Turkmen (Alt-Q)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="801"/>
-        <source>Uyghur</source>
+        <source>Udmurt</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="802"/>
-        <source>Uzbek (Afghanistan)</source>
+        <source>Ukrainian (Windows)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="803"/>
-        <source>Uzbek (Afghanistan, OLPC)</source>
+        <source>Ukrainian (homophonic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="804"/>
-        <source>Uzbek (Latin)</source>
+        <source>Ukrainian (legacy)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="805"/>
-        <source>Vietnamese (French)</source>
+        <source>Ukrainian (phonetic)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="806"/>
-        <source>Vietnamese (US)</source>
+        <source>Ukrainian (standard RSTU)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="807"/>
-        <source>Yakut</source>
+        <source>Ukrainian (typewriter)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="808"/>
+        <source>Urdu (Pakistan, CRULP)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="809"/>
+        <source>Urdu (Pakistan, NLA)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="810"/>
+        <source>Urdu (Windows)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="811"/>
+        <source>Urdu (alt. phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="812"/>
+        <source>Urdu (phonetic)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="813"/>
+        <source>Uyghur</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="814"/>
+        <source>Uzbek (Afghanistan)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="815"/>
+        <source>Uzbek (Afghanistan, OLPC)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="816"/>
+        <source>Uzbek (Latin)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="817"/>
+        <source>Vietnamese (French)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="818"/>
+        <source>Vietnamese (US)</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="819"/>
+        <source>Yakut</source>
+        <comment>kb_variants</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="820"/>
         <source>Yoruba</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
diff --git a/src/modules/keyboard/Config.cpp b/src/modules/keyboard/Config.cpp
index 85bb2e9d6..a2f200a52 100644
--- a/src/modules/keyboard/Config.cpp
+++ b/src/modules/keyboard/Config.cpp
@@ -564,4 +564,5 @@ Config::setConfigurationMap( const QVariantMap& configurationMap )
 void
 Config::retranslate()
 {
+    retranslateKeyboardModels();
 }
diff --git a/src/modules/keyboard/KeyboardData_p.cxxtr b/src/modules/keyboard/KeyboardData_p.cxxtr
index 678bb9807..39783035a 100644
--- a/src/modules/keyboard/KeyboardData_p.cxxtr
+++ b/src/modules/keyboard/KeyboardData_p.cxxtr
@@ -16,797 +16,810 @@
 /* This returns a reference to local, which is a terrible idea.
  * Good thing it's not meant to be compiled.
  */
-static const QStringList& kb_models_table()
-{
+class kb_models : public QObject {
+Q_OBJECT
+public:
+	const QStringList& table()
+	{
 	return QStringList {
-		QObject::tr("A4Tech KB-21", "kb_models"),
-		QObject::tr("A4Tech KBS-8", "kb_models"),
-		QObject::tr("A4Tech Wireless Desktop RFKB-23", "kb_models"),
-		QObject::tr("Acer AirKey V", "kb_models"),
-		QObject::tr("Acer C300", "kb_models"),
-		QObject::tr("Acer Ferrari 4000", "kb_models"),
-		QObject::tr("Acer laptop", "kb_models"),
-		QObject::tr("Advance Scorpius KI", "kb_models"),
-		QObject::tr("Apple", "kb_models"),
-		QObject::tr("Apple Aluminium (ANSI)", "kb_models"),
-		QObject::tr("Apple Aluminium (ISO)", "kb_models"),
-		QObject::tr("Apple Aluminium (JIS)", "kb_models"),
-		QObject::tr("Apple laptop", "kb_models"),
-		QObject::tr("Asus laptop", "kb_models"),
-		QObject::tr("Azona RF2300 wireless Internet", "kb_models"),
-		QObject::tr("BTC 5090", "kb_models"),
-		QObject::tr("BTC 5113RF Multimedia", "kb_models"),
-		QObject::tr("BTC 5126T", "kb_models"),
-		QObject::tr("BTC 6301URF", "kb_models"),
-		QObject::tr("BTC 9000", "kb_models"),
-		QObject::tr("BTC 9000A", "kb_models"),
-		QObject::tr("BTC 9001AH", "kb_models"),
-		QObject::tr("BTC 9019U", "kb_models"),
-		QObject::tr("BTC 9116U Mini Wireless Internet and Gaming", "kb_models"),
-		QObject::tr("BenQ X-Touch", "kb_models"),
-		QObject::tr("BenQ X-Touch 730", "kb_models"),
-		QObject::tr("BenQ X-Touch 800", "kb_models"),
-		QObject::tr("Brother Internet", "kb_models"),
-		QObject::tr("Cherry B.UNLIMITED", "kb_models"),
-		QObject::tr("Cherry Blue Line CyBo@rd", "kb_models"),
-		QObject::tr("Cherry Blue Line CyBo@rd (alt.)", "kb_models"),
-		QObject::tr("Cherry CyBo@rd USB-Hub", "kb_models"),
-		QObject::tr("Cherry CyMotion Expert", "kb_models"),
-		QObject::tr("Cherry CyMotion Master Linux", "kb_models"),
-		QObject::tr("Cherry CyMotion Master XPress", "kb_models"),
-		QObject::tr("Chicony Internet", "kb_models"),
-		QObject::tr("Chicony KB-9885", "kb_models"),
-		QObject::tr("Chicony KU-0108", "kb_models"),
-		QObject::tr("Chicony KU-0420", "kb_models"),
-		QObject::tr("Chromebook", "kb_models"),
-		QObject::tr("Classmate PC", "kb_models"),
-		QObject::tr("Compaq Armada laptop", "kb_models"),
-		QObject::tr("Compaq Easy Access", "kb_models"),
-		QObject::tr("Compaq Internet (13 keys)", "kb_models"),
-		QObject::tr("Compaq Internet (18 keys)", "kb_models"),
-		QObject::tr("Compaq Internet (7 keys)", "kb_models"),
-		QObject::tr("Compaq Presario laptop", "kb_models"),
-		QObject::tr("Compaq iPaq", "kb_models"),
-		QObject::tr("Creative Desktop Wireless 7000", "kb_models"),
-		QObject::tr("DTK2000", "kb_models"),
-		QObject::tr("Dell", "kb_models"),
-		QObject::tr("Dell 101-key PC", "kb_models"),
-		QObject::tr("Dell Inspiron 6000/8000 laptop", "kb_models"),
-		QObject::tr("Dell Latitude laptop", "kb_models"),
-		QObject::tr("Dell Precision M laptop", "kb_models"),
-		QObject::tr("Dell Precision M65 laptop", "kb_models"),
-		QObject::tr("Dell SK-8125", "kb_models"),
-		QObject::tr("Dell SK-8135", "kb_models"),
-		QObject::tr("Dell USB Multimedia", "kb_models"),
-		QObject::tr("Dexxa Wireless Desktop", "kb_models"),
-		QObject::tr("Diamond 9801/9802", "kb_models"),
-		QObject::tr("Ennyah DKB-1008", "kb_models"),
-		QObject::tr("Everex STEPnote", "kb_models"),
-		QObject::tr("FL90", "kb_models"),
-		QObject::tr("Fujitsu-Siemens Amilo laptop", "kb_models"),
-		QObject::tr("Generic 101-key PC", "kb_models"),
-		QObject::tr("Generic 102-key PC", "kb_models"),
-		QObject::tr("Generic 104-key PC", "kb_models"),
-		QObject::tr("Generic 104-key PC with L-shaped Enter key", "kb_models"),
-		QObject::tr("Generic 105-key PC", "kb_models"),
-		QObject::tr("Generic 86-key PC", "kb_models"),
-		QObject::tr("Genius Comfy KB-12e", "kb_models"),
-		QObject::tr("Genius Comfy KB-16M/Multimedia KWD-910", "kb_models"),
-		QObject::tr("Genius Comfy KB-21e-Scroll", "kb_models"),
-		QObject::tr("Genius KB-19e NB", "kb_models"),
-		QObject::tr("Genius KKB-2050HS", "kb_models"),
-		QObject::tr("Gyration", "kb_models"),
-		QObject::tr("Happy Hacking", "kb_models"),
-		QObject::tr("Happy Hacking for Mac", "kb_models"),
-		QObject::tr("Hewlett-Packard Internet", "kb_models"),
-		QObject::tr("Hewlett-Packard Mini 110 laptop", "kb_models"),
-		QObject::tr("Hewlett-Packard NEC SK-2500 Multimedia", "kb_models"),
-		QObject::tr("Hewlett-Packard Omnibook 500", "kb_models"),
-		QObject::tr("Hewlett-Packard Omnibook 500 FA", "kb_models"),
-		QObject::tr("Hewlett-Packard Omnibook 6000/6100", "kb_models"),
-		QObject::tr("Hewlett-Packard Omnibook XE3 GC", "kb_models"),
-		QObject::tr("Hewlett-Packard Omnibook XE3 GF", "kb_models"),
-		QObject::tr("Hewlett-Packard Omnibook XT1000", "kb_models"),
-		QObject::tr("Hewlett-Packard Pavilion ZT1100", "kb_models"),
-		QObject::tr("Hewlett-Packard Pavilion dv5", "kb_models"),
-		QObject::tr("Hewlett-Packard nx9020", "kb_models"),
-		QObject::tr("Honeywell Euroboard", "kb_models"),
-		QObject::tr("IBM Rapid Access", "kb_models"),
-		QObject::tr("IBM Rapid Access II", "kb_models"),
-		QObject::tr("IBM Space Saver", "kb_models"),
-		QObject::tr("IBM ThinkPad 560Z/600/600E/A22E", "kb_models"),
-		QObject::tr("IBM ThinkPad R60/T60/R61/T61", "kb_models"),
-		QObject::tr("IBM ThinkPad Z60m/Z60t/Z61m/Z61t", "kb_models"),
-		QObject::tr("Keytronic FlexPro", "kb_models"),
-		QObject::tr("Kinesis", "kb_models"),
-		QObject::tr("Logitech", "kb_models"),
-		QObject::tr("Logitech Access", "kb_models"),
-		QObject::tr("Logitech Cordless Desktop", "kb_models"),
-		QObject::tr("Logitech Cordless Desktop (alt.)", "kb_models"),
-		QObject::tr("Logitech Cordless Desktop EX110", "kb_models"),
-		QObject::tr("Logitech Cordless Desktop LX-300", "kb_models"),
-		QObject::tr("Logitech Cordless Desktop Navigator", "kb_models"),
-		QObject::tr("Logitech Cordless Desktop Optical", "kb_models"),
-		QObject::tr("Logitech Cordless Desktop Pro (2nd alt.)", "kb_models"),
-		QObject::tr("Logitech Cordless Desktop iTouch", "kb_models"),
-		QObject::tr("Logitech Cordless Freedom/Desktop Navigator", "kb_models"),
-		QObject::tr("Logitech G15 extra keys via G15daemon", "kb_models"),
-		QObject::tr("Logitech Internet", "kb_models"),
-		QObject::tr("Logitech Internet 350", "kb_models"),
-		QObject::tr("Logitech Internet Navigator", "kb_models"),
-		QObject::tr("Logitech Ultra-X", "kb_models"),
-		QObject::tr("Logitech Ultra-X Cordless Media Desktop", "kb_models"),
-		QObject::tr("Logitech diNovo", "kb_models"),
-		QObject::tr("Logitech diNovo Edge", "kb_models"),
-		QObject::tr("Logitech iTouch", "kb_models"),
-		QObject::tr("Logitech iTouch Cordless Y-RB6", "kb_models"),
-		QObject::tr("Logitech iTouch Internet Navigator SE", "kb_models"),
-		QObject::tr("Logitech iTouch Internet Navigator SE USB", "kb_models"),
-		QObject::tr("MacBook/MacBook Pro", "kb_models"),
-		QObject::tr("MacBook/MacBook Pro (intl.)", "kb_models"),
-		QObject::tr("Macintosh", "kb_models"),
-		QObject::tr("Macintosh Old", "kb_models"),
-		QObject::tr("Memorex MX1998", "kb_models"),
-		QObject::tr("Memorex MX2500 EZ-Access", "kb_models"),
-		QObject::tr("Memorex MX2750", "kb_models"),
-		QObject::tr("Microsoft Comfort Curve 2000", "kb_models"),
-		QObject::tr("Microsoft Internet", "kb_models"),
-		QObject::tr("Microsoft Internet Pro (Swedish)", "kb_models"),
-		QObject::tr("Microsoft Natural", "kb_models"),
-		QObject::tr("Microsoft Natural Elite", "kb_models"),
-		QObject::tr("Microsoft Natural Ergonomic 4000", "kb_models"),
-		QObject::tr("Microsoft Natural Pro OEM", "kb_models"),
-		QObject::tr("Microsoft Natural Pro USB/Internet Pro", "kb_models"),
-		QObject::tr("Microsoft Natural Pro/Internet Pro", "kb_models"),
-		QObject::tr("Microsoft Natural Wireless Ergonomic 7000", "kb_models"),
-		QObject::tr("Microsoft Office Keyboard", "kb_models"),
-		QObject::tr("Microsoft Surface", "kb_models"),
-		QObject::tr("Microsoft Wireless Multimedia 1.0A", "kb_models"),
-		QObject::tr("NEC SK-1300", "kb_models"),
-		QObject::tr("NEC SK-2500", "kb_models"),
-		QObject::tr("NEC SK-6200", "kb_models"),
-		QObject::tr("NEC SK-7100", "kb_models"),
-		QObject::tr("Northgate OmniKey 101", "kb_models"),
-		QObject::tr("OLPC", "kb_models"),
-		QObject::tr("Ortek Multimedia/Internet MCK-800", "kb_models"),
-		QObject::tr("PC-98", "kb_models"),
-		QObject::tr("Propeller Voyager KTEZ-1000", "kb_models"),
-		QObject::tr("QTronix Scorpius 98N+", "kb_models"),
-		QObject::tr("SVEN Ergonomic 2500", "kb_models"),
-		QObject::tr("SVEN Slim 303", "kb_models"),
-		QObject::tr("Samsung SDM 4500P", "kb_models"),
-		QObject::tr("Samsung SDM 4510P", "kb_models"),
-		QObject::tr("Sanwa Supply SKB-KG3", "kb_models"),
-		QObject::tr("Silvercrest Multimedia Wireless", "kb_models"),
-		QObject::tr("SteelSeries Apex 300 (Apex RAW)", "kb_models"),
-		QObject::tr("Sun Type 6 (Japanese)", "kb_models"),
-		QObject::tr("Sun Type 6 USB (Japanese)", "kb_models"),
-		QObject::tr("Sun Type 6 USB (Unix)", "kb_models"),
-		QObject::tr("Sun Type 6/7 USB", "kb_models"),
-		QObject::tr("Sun Type 6/7 USB (European)", "kb_models"),
-		QObject::tr("Sun Type 7 USB", "kb_models"),
-		QObject::tr("Sun Type 7 USB (European)", "kb_models"),
-		QObject::tr("Sun Type 7 USB (Japanese)/Japanese 106-key", "kb_models"),
-		QObject::tr("Sun Type 7 USB (Unix)", "kb_models"),
-		QObject::tr("Super Power Multimedia", "kb_models"),
-		QObject::tr("Symplon PaceBook tablet", "kb_models"),
-		QObject::tr("Targa Visionary 811", "kb_models"),
-		QObject::tr("Toshiba Satellite S3000", "kb_models"),
-		QObject::tr("Truly Ergonomic 227", "kb_models"),
-		QObject::tr("Truly Ergonomic 229", "kb_models"),
-		QObject::tr("Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)", "kb_models"),
-		QObject::tr("Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)", "kb_models"),
-		QObject::tr("Trust Direct Access", "kb_models"),
-		QObject::tr("Trust Slimline", "kb_models"),
-		QObject::tr("Trust Wireless Classic", "kb_models"),
-		QObject::tr("TypeMatrix EZ-Reach 2020", "kb_models"),
-		QObject::tr("TypeMatrix EZ-Reach 2030 PS2", "kb_models"),
-		QObject::tr("TypeMatrix EZ-Reach 2030 USB", "kb_models"),
-		QObject::tr("TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)", "kb_models"),
-		QObject::tr("TypeMatrix EZ-Reach 2030 USB (106:JP mode)", "kb_models"),
-		QObject::tr("Unitek KB-1925", "kb_models"),
-		QObject::tr("ViewSonic KU-306 Internet", "kb_models"),
-		QObject::tr("Winbook Model XP5", "kb_models"),
-		QObject::tr("Yahoo! Internet", "kb_models"),
-		QObject::tr("eMachines m6800 laptop", "kb_models"),
+		tr("A4Tech KB-21", "kb_models"),
+		tr("A4Tech KBS-8", "kb_models"),
+		tr("A4Tech Wireless Desktop RFKB-23", "kb_models"),
+		tr("Acer AirKey V", "kb_models"),
+		tr("Acer C300", "kb_models"),
+		tr("Acer Ferrari 4000", "kb_models"),
+		tr("Acer laptop", "kb_models"),
+		tr("Advance Scorpius KI", "kb_models"),
+		tr("Apple", "kb_models"),
+		tr("Apple Aluminium (ANSI)", "kb_models"),
+		tr("Apple Aluminium (ISO)", "kb_models"),
+		tr("Apple Aluminium (JIS)", "kb_models"),
+		tr("Apple laptop", "kb_models"),
+		tr("Asus laptop", "kb_models"),
+		tr("Azona RF2300 wireless Internet", "kb_models"),
+		tr("BTC 5090", "kb_models"),
+		tr("BTC 5113RF Multimedia", "kb_models"),
+		tr("BTC 5126T", "kb_models"),
+		tr("BTC 6301URF", "kb_models"),
+		tr("BTC 9000", "kb_models"),
+		tr("BTC 9000A", "kb_models"),
+		tr("BTC 9001AH", "kb_models"),
+		tr("BTC 9019U", "kb_models"),
+		tr("BTC 9116U Mini Wireless Internet and Gaming", "kb_models"),
+		tr("BenQ X-Touch", "kb_models"),
+		tr("BenQ X-Touch 730", "kb_models"),
+		tr("BenQ X-Touch 800", "kb_models"),
+		tr("Brother Internet", "kb_models"),
+		tr("Cherry B.UNLIMITED", "kb_models"),
+		tr("Cherry Blue Line CyBo@rd", "kb_models"),
+		tr("Cherry Blue Line CyBo@rd (alt.)", "kb_models"),
+		tr("Cherry CyBo@rd USB-Hub", "kb_models"),
+		tr("Cherry CyMotion Expert", "kb_models"),
+		tr("Cherry CyMotion Master Linux", "kb_models"),
+		tr("Cherry CyMotion Master XPress", "kb_models"),
+		tr("Chicony Internet", "kb_models"),
+		tr("Chicony KB-9885", "kb_models"),
+		tr("Chicony KU-0108", "kb_models"),
+		tr("Chicony KU-0420", "kb_models"),
+		tr("Chromebook", "kb_models"),
+		tr("Classmate PC", "kb_models"),
+		tr("Compaq Armada laptop", "kb_models"),
+		tr("Compaq Easy Access", "kb_models"),
+		tr("Compaq Internet (13 keys)", "kb_models"),
+		tr("Compaq Internet (18 keys)", "kb_models"),
+		tr("Compaq Internet (7 keys)", "kb_models"),
+		tr("Compaq Presario laptop", "kb_models"),
+		tr("Compaq iPaq", "kb_models"),
+		tr("Creative Desktop Wireless 7000", "kb_models"),
+		tr("DTK2000", "kb_models"),
+		tr("Dell", "kb_models"),
+		tr("Dell 101-key PC", "kb_models"),
+		tr("Dell Inspiron 6000/8000 laptop", "kb_models"),
+		tr("Dell Latitude laptop", "kb_models"),
+		tr("Dell Precision M laptop", "kb_models"),
+		tr("Dell Precision M65 laptop", "kb_models"),
+		tr("Dell SK-8125", "kb_models"),
+		tr("Dell SK-8135", "kb_models"),
+		tr("Dell USB Multimedia", "kb_models"),
+		tr("Dexxa Wireless Desktop", "kb_models"),
+		tr("Diamond 9801/9802", "kb_models"),
+		tr("Ennyah DKB-1008", "kb_models"),
+		tr("Everex STEPnote", "kb_models"),
+		tr("FL90", "kb_models"),
+		tr("Fujitsu-Siemens Amilo laptop", "kb_models"),
+		tr("Generic 101-key PC", "kb_models"),
+		tr("Generic 102-key PC", "kb_models"),
+		tr("Generic 104-key PC", "kb_models"),
+		tr("Generic 104-key PC with L-shaped Enter key", "kb_models"),
+		tr("Generic 105-key PC", "kb_models"),
+		tr("Generic 86-key PC", "kb_models"),
+		tr("Genius Comfy KB-12e", "kb_models"),
+		tr("Genius Comfy KB-16M/Multimedia KWD-910", "kb_models"),
+		tr("Genius Comfy KB-21e-Scroll", "kb_models"),
+		tr("Genius KB-19e NB", "kb_models"),
+		tr("Genius KKB-2050HS", "kb_models"),
+		tr("Gyration", "kb_models"),
+		tr("Happy Hacking", "kb_models"),
+		tr("Happy Hacking for Mac", "kb_models"),
+		tr("Hewlett-Packard Internet", "kb_models"),
+		tr("Hewlett-Packard Mini 110 laptop", "kb_models"),
+		tr("Hewlett-Packard NEC SK-2500 Multimedia", "kb_models"),
+		tr("Hewlett-Packard Omnibook 500", "kb_models"),
+		tr("Hewlett-Packard Omnibook 500 FA", "kb_models"),
+		tr("Hewlett-Packard Omnibook 6000/6100", "kb_models"),
+		tr("Hewlett-Packard Omnibook XE3 GC", "kb_models"),
+		tr("Hewlett-Packard Omnibook XE3 GF", "kb_models"),
+		tr("Hewlett-Packard Omnibook XT1000", "kb_models"),
+		tr("Hewlett-Packard Pavilion ZT1100", "kb_models"),
+		tr("Hewlett-Packard Pavilion dv5", "kb_models"),
+		tr("Hewlett-Packard nx9020", "kb_models"),
+		tr("Honeywell Euroboard", "kb_models"),
+		tr("IBM Rapid Access", "kb_models"),
+		tr("IBM Rapid Access II", "kb_models"),
+		tr("IBM Space Saver", "kb_models"),
+		tr("IBM ThinkPad 560Z/600/600E/A22E", "kb_models"),
+		tr("IBM ThinkPad R60/T60/R61/T61", "kb_models"),
+		tr("IBM ThinkPad Z60m/Z60t/Z61m/Z61t", "kb_models"),
+		tr("Keytronic FlexPro", "kb_models"),
+		tr("Kinesis", "kb_models"),
+		tr("Logitech", "kb_models"),
+		tr("Logitech Access", "kb_models"),
+		tr("Logitech Cordless Desktop", "kb_models"),
+		tr("Logitech Cordless Desktop (alt.)", "kb_models"),
+		tr("Logitech Cordless Desktop EX110", "kb_models"),
+		tr("Logitech Cordless Desktop LX-300", "kb_models"),
+		tr("Logitech Cordless Desktop Navigator", "kb_models"),
+		tr("Logitech Cordless Desktop Optical", "kb_models"),
+		tr("Logitech Cordless Desktop Pro (2nd alt.)", "kb_models"),
+		tr("Logitech Cordless Desktop iTouch", "kb_models"),
+		tr("Logitech Cordless Freedom/Desktop Navigator", "kb_models"),
+		tr("Logitech G15 extra keys via G15daemon", "kb_models"),
+		tr("Logitech Internet", "kb_models"),
+		tr("Logitech Internet 350", "kb_models"),
+		tr("Logitech Internet Navigator", "kb_models"),
+		tr("Logitech Ultra-X", "kb_models"),
+		tr("Logitech Ultra-X Cordless Media Desktop", "kb_models"),
+		tr("Logitech diNovo", "kb_models"),
+		tr("Logitech diNovo Edge", "kb_models"),
+		tr("Logitech iTouch", "kb_models"),
+		tr("Logitech iTouch Cordless Y-RB6", "kb_models"),
+		tr("Logitech iTouch Internet Navigator SE", "kb_models"),
+		tr("Logitech iTouch Internet Navigator SE USB", "kb_models"),
+		tr("MacBook/MacBook Pro", "kb_models"),
+		tr("MacBook/MacBook Pro (intl.)", "kb_models"),
+		tr("Macintosh", "kb_models"),
+		tr("Macintosh Old", "kb_models"),
+		tr("Memorex MX1998", "kb_models"),
+		tr("Memorex MX2500 EZ-Access", "kb_models"),
+		tr("Memorex MX2750", "kb_models"),
+		tr("Microsoft Comfort Curve 2000", "kb_models"),
+		tr("Microsoft Internet", "kb_models"),
+		tr("Microsoft Internet Pro (Swedish)", "kb_models"),
+		tr("Microsoft Natural", "kb_models"),
+		tr("Microsoft Natural Elite", "kb_models"),
+		tr("Microsoft Natural Ergonomic 4000", "kb_models"),
+		tr("Microsoft Natural Pro OEM", "kb_models"),
+		tr("Microsoft Natural Pro USB/Internet Pro", "kb_models"),
+		tr("Microsoft Natural Pro/Internet Pro", "kb_models"),
+		tr("Microsoft Natural Wireless Ergonomic 7000", "kb_models"),
+		tr("Microsoft Office Keyboard", "kb_models"),
+		tr("Microsoft Surface", "kb_models"),
+		tr("Microsoft Wireless Multimedia 1.0A", "kb_models"),
+		tr("NEC SK-1300", "kb_models"),
+		tr("NEC SK-2500", "kb_models"),
+		tr("NEC SK-6200", "kb_models"),
+		tr("NEC SK-7100", "kb_models"),
+		tr("Northgate OmniKey 101", "kb_models"),
+		tr("OLPC", "kb_models"),
+		tr("Ortek Multimedia/Internet MCK-800", "kb_models"),
+		tr("PC-98", "kb_models"),
+		tr("Propeller Voyager KTEZ-1000", "kb_models"),
+		tr("QTronix Scorpius 98N+", "kb_models"),
+		tr("SVEN Ergonomic 2500", "kb_models"),
+		tr("SVEN Slim 303", "kb_models"),
+		tr("Samsung SDM 4500P", "kb_models"),
+		tr("Samsung SDM 4510P", "kb_models"),
+		tr("Sanwa Supply SKB-KG3", "kb_models"),
+		tr("Silvercrest Multimedia Wireless", "kb_models"),
+		tr("SteelSeries Apex 300 (Apex RAW)", "kb_models"),
+		tr("Sun Type 6 (Japanese)", "kb_models"),
+		tr("Sun Type 6 USB (Japanese)", "kb_models"),
+		tr("Sun Type 6 USB (Unix)", "kb_models"),
+		tr("Sun Type 6/7 USB", "kb_models"),
+		tr("Sun Type 6/7 USB (European)", "kb_models"),
+		tr("Sun Type 7 USB", "kb_models"),
+		tr("Sun Type 7 USB (European)", "kb_models"),
+		tr("Sun Type 7 USB (Japanese)/Japanese 106-key", "kb_models"),
+		tr("Sun Type 7 USB (Unix)", "kb_models"),
+		tr("Super Power Multimedia", "kb_models"),
+		tr("Symplon PaceBook tablet", "kb_models"),
+		tr("Targa Visionary 811", "kb_models"),
+		tr("Toshiba Satellite S3000", "kb_models"),
+		tr("Truly Ergonomic 227", "kb_models"),
+		tr("Truly Ergonomic 229", "kb_models"),
+		tr("Truly Ergonomic Computer Keyboard Model 227 (Wide Alt keys)", "kb_models"),
+		tr("Truly Ergonomic Computer Keyboard Model 229 (Standard sized Alt keys, additional Super and Menu key)", "kb_models"),
+		tr("Trust Direct Access", "kb_models"),
+		tr("Trust Slimline", "kb_models"),
+		tr("Trust Wireless Classic", "kb_models"),
+		tr("TypeMatrix EZ-Reach 2020", "kb_models"),
+		tr("TypeMatrix EZ-Reach 2030 PS2", "kb_models"),
+		tr("TypeMatrix EZ-Reach 2030 USB", "kb_models"),
+		tr("TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)", "kb_models"),
+		tr("TypeMatrix EZ-Reach 2030 USB (106:JP mode)", "kb_models"),
+		tr("Unitek KB-1925", "kb_models"),
+		tr("ViewSonic KU-306 Internet", "kb_models"),
+		tr("Winbook Model XP5", "kb_models"),
+		tr("Yahoo! Internet", "kb_models"),
+		tr("eMachines m6800 laptop", "kb_models"),
 		QString()
 	};
 }
+}
 
 /* This returns a reference to local, which is a terrible idea.
  * Good thing it's not meant to be compiled.
  */
-static const QStringList& kb_layouts_table()
-{
+class kb_layouts : public QObject {
+Q_OBJECT
+public:
+	const QStringList& table()
+	{
 	return QStringList {
-		QObject::tr("Afghani", "kb_layouts"),
-		QObject::tr("Albanian", "kb_layouts"),
-		QObject::tr("Amharic", "kb_layouts"),
-		QObject::tr("Arabic", "kb_layouts"),
-		QObject::tr("Arabic (Morocco)", "kb_layouts"),
-		QObject::tr("Arabic (Syria)", "kb_layouts"),
-		QObject::tr("Armenian", "kb_layouts"),
-		QObject::tr("Azerbaijani", "kb_layouts"),
-		QObject::tr("Bambara", "kb_layouts"),
-		QObject::tr("Bangla", "kb_layouts"),
-		QObject::tr("Belarusian", "kb_layouts"),
-		QObject::tr("Belgian", "kb_layouts"),
-		QObject::tr("Bosnian", "kb_layouts"),
-		QObject::tr("Braille", "kb_layouts"),
-		QObject::tr("Bulgarian", "kb_layouts"),
-		QObject::tr("Burmese", "kb_layouts"),
-		QObject::tr("Chinese", "kb_layouts"),
-		QObject::tr("Croatian", "kb_layouts"),
-		QObject::tr("Czech", "kb_layouts"),
-		QObject::tr("Danish", "kb_layouts"),
-		QObject::tr("Dhivehi", "kb_layouts"),
-		QObject::tr("Dutch", "kb_layouts"),
-		QObject::tr("Dzongkha", "kb_layouts"),
-		QObject::tr("English (Australian)", "kb_layouts"),
-		QObject::tr("English (Cameroon)", "kb_layouts"),
-		QObject::tr("English (Ghana)", "kb_layouts"),
-		QObject::tr("English (Nigeria)", "kb_layouts"),
-		QObject::tr("English (South Africa)", "kb_layouts"),
-		QObject::tr("English (UK)", "kb_layouts"),
-		QObject::tr("English (US)", "kb_layouts"),
-		QObject::tr("Esperanto", "kb_layouts"),
-		QObject::tr("Estonian", "kb_layouts"),
-		QObject::tr("Faroese", "kb_layouts"),
-		QObject::tr("Filipino", "kb_layouts"),
-		QObject::tr("Finnish", "kb_layouts"),
-		QObject::tr("French", "kb_layouts"),
-		QObject::tr("French (Canada)", "kb_layouts"),
-		QObject::tr("French (Democratic Republic of the Congo)", "kb_layouts"),
-		QObject::tr("French (Guinea)", "kb_layouts"),
-		QObject::tr("French (Togo)", "kb_layouts"),
-		QObject::tr("Georgian", "kb_layouts"),
-		QObject::tr("German", "kb_layouts"),
-		QObject::tr("German (Austria)", "kb_layouts"),
-		QObject::tr("German (Switzerland)", "kb_layouts"),
-		QObject::tr("Greek", "kb_layouts"),
-		QObject::tr("Hebrew", "kb_layouts"),
-		QObject::tr("Hungarian", "kb_layouts"),
-		QObject::tr("Icelandic", "kb_layouts"),
-		QObject::tr("Indian", "kb_layouts"),
-		QObject::tr("Indonesian (Arab Melayu, phonetic)", "kb_layouts"),
-		QObject::tr("Indonesian (Javanese)", "kb_layouts"),
-		QObject::tr("Iraqi", "kb_layouts"),
-		QObject::tr("Irish", "kb_layouts"),
-		QObject::tr("Italian", "kb_layouts"),
-		QObject::tr("Japanese", "kb_layouts"),
-		QObject::tr("Japanese (PC-98)", "kb_layouts"),
-		QObject::tr("Kabylian (azerty layout, no dead keys)", "kb_layouts"),
-		QObject::tr("Kazakh", "kb_layouts"),
-		QObject::tr("Khmer (Cambodia)", "kb_layouts"),
-		QObject::tr("Korean", "kb_layouts"),
-		QObject::tr("Kyrgyz", "kb_layouts"),
-		QObject::tr("Lao", "kb_layouts"),
-		QObject::tr("Latvian", "kb_layouts"),
-		QObject::tr("Lithuanian", "kb_layouts"),
-		QObject::tr("Macedonian", "kb_layouts"),
-		QObject::tr("Malay (Jawi, Arabic Keyboard)", "kb_layouts"),
-		QObject::tr("Maltese", "kb_layouts"),
-		QObject::tr("Maori", "kb_layouts"),
-		QObject::tr("Moldavian", "kb_layouts"),
-		QObject::tr("Mongolian", "kb_layouts"),
-		QObject::tr("Montenegrin", "kb_layouts"),
-		QObject::tr("Nepali", "kb_layouts"),
-		QObject::tr("Norwegian", "kb_layouts"),
-		QObject::tr("Persian", "kb_layouts"),
-		QObject::tr("Polish", "kb_layouts"),
-		QObject::tr("Portuguese", "kb_layouts"),
-		QObject::tr("Portuguese (Brazil)", "kb_layouts"),
-		QObject::tr("Romanian", "kb_layouts"),
-		QObject::tr("Russian", "kb_layouts"),
-		QObject::tr("Serbian", "kb_layouts"),
-		QObject::tr("Sinhala (phonetic)", "kb_layouts"),
-		QObject::tr("Slovak", "kb_layouts"),
-		QObject::tr("Slovenian", "kb_layouts"),
-		QObject::tr("Spanish", "kb_layouts"),
-		QObject::tr("Spanish (Latin American)", "kb_layouts"),
-		QObject::tr("Swahili (Kenya)", "kb_layouts"),
-		QObject::tr("Swahili (Tanzania)", "kb_layouts"),
-		QObject::tr("Swedish", "kb_layouts"),
-		QObject::tr("Taiwanese", "kb_layouts"),
-		QObject::tr("Tajik", "kb_layouts"),
-		QObject::tr("Thai", "kb_layouts"),
-		QObject::tr("Tswana", "kb_layouts"),
-		QObject::tr("Turkish", "kb_layouts"),
-		QObject::tr("Turkmen", "kb_layouts"),
-		QObject::tr("Ukrainian", "kb_layouts"),
-		QObject::tr("Urdu (Pakistan)", "kb_layouts"),
-		QObject::tr("Uzbek", "kb_layouts"),
-		QObject::tr("Vietnamese", "kb_layouts"),
-		QObject::tr("Wolof", "kb_layouts"),
+		tr("Afghani", "kb_layouts"),
+		tr("Albanian", "kb_layouts"),
+		tr("Amharic", "kb_layouts"),
+		tr("Arabic", "kb_layouts"),
+		tr("Arabic (Morocco)", "kb_layouts"),
+		tr("Arabic (Syria)", "kb_layouts"),
+		tr("Armenian", "kb_layouts"),
+		tr("Azerbaijani", "kb_layouts"),
+		tr("Bambara", "kb_layouts"),
+		tr("Bangla", "kb_layouts"),
+		tr("Belarusian", "kb_layouts"),
+		tr("Belgian", "kb_layouts"),
+		tr("Bosnian", "kb_layouts"),
+		tr("Braille", "kb_layouts"),
+		tr("Bulgarian", "kb_layouts"),
+		tr("Burmese", "kb_layouts"),
+		tr("Chinese", "kb_layouts"),
+		tr("Croatian", "kb_layouts"),
+		tr("Czech", "kb_layouts"),
+		tr("Danish", "kb_layouts"),
+		tr("Dhivehi", "kb_layouts"),
+		tr("Dutch", "kb_layouts"),
+		tr("Dzongkha", "kb_layouts"),
+		tr("English (Australian)", "kb_layouts"),
+		tr("English (Cameroon)", "kb_layouts"),
+		tr("English (Ghana)", "kb_layouts"),
+		tr("English (Nigeria)", "kb_layouts"),
+		tr("English (South Africa)", "kb_layouts"),
+		tr("English (UK)", "kb_layouts"),
+		tr("English (US)", "kb_layouts"),
+		tr("Esperanto", "kb_layouts"),
+		tr("Estonian", "kb_layouts"),
+		tr("Faroese", "kb_layouts"),
+		tr("Filipino", "kb_layouts"),
+		tr("Finnish", "kb_layouts"),
+		tr("French", "kb_layouts"),
+		tr("French (Canada)", "kb_layouts"),
+		tr("French (Democratic Republic of the Congo)", "kb_layouts"),
+		tr("French (Guinea)", "kb_layouts"),
+		tr("French (Togo)", "kb_layouts"),
+		tr("Georgian", "kb_layouts"),
+		tr("German", "kb_layouts"),
+		tr("German (Austria)", "kb_layouts"),
+		tr("German (Switzerland)", "kb_layouts"),
+		tr("Greek", "kb_layouts"),
+		tr("Hebrew", "kb_layouts"),
+		tr("Hungarian", "kb_layouts"),
+		tr("Icelandic", "kb_layouts"),
+		tr("Indian", "kb_layouts"),
+		tr("Indonesian (Arab Melayu, phonetic)", "kb_layouts"),
+		tr("Indonesian (Javanese)", "kb_layouts"),
+		tr("Iraqi", "kb_layouts"),
+		tr("Irish", "kb_layouts"),
+		tr("Italian", "kb_layouts"),
+		tr("Japanese", "kb_layouts"),
+		tr("Japanese (PC-98)", "kb_layouts"),
+		tr("Kabylian (azerty layout, no dead keys)", "kb_layouts"),
+		tr("Kazakh", "kb_layouts"),
+		tr("Khmer (Cambodia)", "kb_layouts"),
+		tr("Korean", "kb_layouts"),
+		tr("Kyrgyz", "kb_layouts"),
+		tr("Lao", "kb_layouts"),
+		tr("Latvian", "kb_layouts"),
+		tr("Lithuanian", "kb_layouts"),
+		tr("Macedonian", "kb_layouts"),
+		tr("Malay (Jawi, Arabic Keyboard)", "kb_layouts"),
+		tr("Maltese", "kb_layouts"),
+		tr("Maori", "kb_layouts"),
+		tr("Moldavian", "kb_layouts"),
+		tr("Mongolian", "kb_layouts"),
+		tr("Montenegrin", "kb_layouts"),
+		tr("Nepali", "kb_layouts"),
+		tr("Norwegian", "kb_layouts"),
+		tr("Persian", "kb_layouts"),
+		tr("Polish", "kb_layouts"),
+		tr("Portuguese", "kb_layouts"),
+		tr("Portuguese (Brazil)", "kb_layouts"),
+		tr("Romanian", "kb_layouts"),
+		tr("Russian", "kb_layouts"),
+		tr("Serbian", "kb_layouts"),
+		tr("Sinhala (phonetic)", "kb_layouts"),
+		tr("Slovak", "kb_layouts"),
+		tr("Slovenian", "kb_layouts"),
+		tr("Spanish", "kb_layouts"),
+		tr("Spanish (Latin American)", "kb_layouts"),
+		tr("Swahili (Kenya)", "kb_layouts"),
+		tr("Swahili (Tanzania)", "kb_layouts"),
+		tr("Swedish", "kb_layouts"),
+		tr("Taiwanese", "kb_layouts"),
+		tr("Tajik", "kb_layouts"),
+		tr("Thai", "kb_layouts"),
+		tr("Tswana", "kb_layouts"),
+		tr("Turkish", "kb_layouts"),
+		tr("Turkmen", "kb_layouts"),
+		tr("Ukrainian", "kb_layouts"),
+		tr("Urdu (Pakistan)", "kb_layouts"),
+		tr("Uzbek", "kb_layouts"),
+		tr("Vietnamese", "kb_layouts"),
+		tr("Wolof", "kb_layouts"),
 		QString()
 	};
 }
+}
 
 /* This returns a reference to local, which is a terrible idea.
  * Good thing it's not meant to be compiled.
  */
-static const QStringList& kb_variants_table()
-{
+class kb_variants : public QObject {
+Q_OBJECT
+public:
+	const QStringList& table()
+	{
 	return QStringList {
-		QObject::tr("Akan", "kb_variants"),
-		QObject::tr("Albanian (Plisi)", "kb_variants"),
-		QObject::tr("Albanian (Veqilharxhi)", "kb_variants"),
-		QObject::tr("Arabic (AZERTY)", "kb_variants"),
-		QObject::tr("Arabic (AZERTY, Eastern Arabic numerals)", "kb_variants"),
-		QObject::tr("Arabic (Algeria)", "kb_variants"),
-		QObject::tr("Arabic (Buckwalter)", "kb_variants"),
-		QObject::tr("Arabic (Eastern Arabic numerals)", "kb_variants"),
-		QObject::tr("Arabic (Macintosh)", "kb_variants"),
-		QObject::tr("Arabic (OLPC)", "kb_variants"),
-		QObject::tr("Arabic (Pakistan)", "kb_variants"),
-		QObject::tr("Arabic (QWERTY)", "kb_variants"),
-		QObject::tr("Arabic (QWERTY, Eastern Arabic numerals)", "kb_variants"),
-		QObject::tr("Armenian (alt. eastern)", "kb_variants"),
-		QObject::tr("Armenian (alt. phonetic)", "kb_variants"),
-		QObject::tr("Armenian (eastern)", "kb_variants"),
-		QObject::tr("Armenian (phonetic)", "kb_variants"),
-		QObject::tr("Armenian (western)", "kb_variants"),
-		QObject::tr("Asturian (Spain, with bottom-dot H and L)", "kb_variants"),
-		QObject::tr("Avatime", "kb_variants"),
-		QObject::tr("Azerbaijani (Cyrillic)", "kb_variants"),
-		QObject::tr("Bangla (India)", "kb_variants"),
-		QObject::tr("Bangla (India, Baishakhi Inscript)", "kb_variants"),
-		QObject::tr("Bangla (India, Baishakhi)", "kb_variants"),
-		QObject::tr("Bangla (India, Bornona)", "kb_variants"),
-		QObject::tr("Bangla (India, Gitanjali)", "kb_variants"),
-		QObject::tr("Bangla (India, Probhat)", "kb_variants"),
-		QObject::tr("Bangla (Probhat)", "kb_variants"),
-		QObject::tr("Bashkirian", "kb_variants"),
-		QObject::tr("Belarusian (Latin)", "kb_variants"),
-		QObject::tr("Belarusian (intl.)", "kb_variants"),
-		QObject::tr("Belarusian (legacy)", "kb_variants"),
-		QObject::tr("Belgian (ISO, alt.)", "kb_variants"),
-		QObject::tr("Belgian (Latin-9 only, alt.)", "kb_variants"),
-		QObject::tr("Belgian (Sun dead keys)", "kb_variants"),
-		QObject::tr("Belgian (Sun dead keys, alt.)", "kb_variants"),
-		QObject::tr("Belgian (Wang 724 AZERTY)", "kb_variants"),
-		QObject::tr("Belgian (alt.)", "kb_variants"),
-		QObject::tr("Belgian (no dead keys)", "kb_variants"),
-		QObject::tr("Berber (Morocco, Tifinagh alt.)", "kb_variants"),
-		QObject::tr("Berber (Morocco, Tifinagh extended phonetic)", "kb_variants"),
-		QObject::tr("Berber (Morocco, Tifinagh extended)", "kb_variants"),
-		QObject::tr("Berber (Morocco, Tifinagh phonetic)", "kb_variants"),
-		QObject::tr("Berber (Morocco, Tifinagh phonetic, alt.)", "kb_variants"),
-		QObject::tr("Berber (Morocco, Tifinagh)", "kb_variants"),
-		QObject::tr("Bosnian (US)", "kb_variants"),
-		QObject::tr("Bosnian (US, with Bosnian digraphs)", "kb_variants"),
-		QObject::tr("Bosnian (with Bosnian digraphs)", "kb_variants"),
-		QObject::tr("Bosnian (with guillemets)", "kb_variants"),
-		QObject::tr("Braille (left-handed inverted thumb)", "kb_variants"),
-		QObject::tr("Braille (left-handed)", "kb_variants"),
-		QObject::tr("Braille (right-handed inverted thumb)", "kb_variants"),
-		QObject::tr("Braille (right-handed)", "kb_variants"),
-		QObject::tr("Bulgarian (enhanced)", "kb_variants"),
-		QObject::tr("Bulgarian (new phonetic)", "kb_variants"),
-		QObject::tr("Bulgarian (traditional phonetic)", "kb_variants"),
-		QObject::tr("Burmese Zawgyi", "kb_variants"),
-		QObject::tr("Cameroon (AZERTY, intl.)", "kb_variants"),
-		QObject::tr("Cameroon (Dvorak, intl.)", "kb_variants"),
-		QObject::tr("Cameroon Multilingual (QWERTY, intl.)", "kb_variants"),
-		QObject::tr("Canadian (intl.)", "kb_variants"),
-		QObject::tr("Canadian (intl., 1st part)", "kb_variants"),
-		QObject::tr("Canadian (intl., 2nd part)", "kb_variants"),
-		QObject::tr("Catalan (Spain, with middle-dot L)", "kb_variants"),
-		QObject::tr("Cherokee", "kb_variants"),
-		QObject::tr("Chuvash", "kb_variants"),
-		QObject::tr("Chuvash (Latin)", "kb_variants"),
-		QObject::tr("CloGaelach", "kb_variants"),
-		QObject::tr("Crimean Tatar (Turkish Alt-Q)", "kb_variants"),
-		QObject::tr("Crimean Tatar (Turkish F)", "kb_variants"),
-		QObject::tr("Crimean Tatar (Turkish Q)", "kb_variants"),
-		QObject::tr("Croatian (US)", "kb_variants"),
-		QObject::tr("Croatian (US, with Croatian digraphs)", "kb_variants"),
-		QObject::tr("Croatian (with Croatian digraphs)", "kb_variants"),
-		QObject::tr("Croatian (with guillemets)", "kb_variants"),
-		QObject::tr("Czech (QWERTY)", "kb_variants"),
-		QObject::tr("Czech (QWERTY, Macintosh)", "kb_variants"),
-		QObject::tr("Czech (QWERTY, extended backslash)", "kb_variants"),
-		QObject::tr("Czech (UCW, only accented letters)", "kb_variants"),
-		QObject::tr("Czech (US, Dvorak, UCW support)", "kb_variants"),
-		QObject::tr("Czech (with &lt;\|&gt; key)", "kb_variants"),
-		QObject::tr("Danish (Dvorak)", "kb_variants"),
-		QObject::tr("Danish (Macintosh)", "kb_variants"),
-		QObject::tr("Danish (Macintosh, no dead keys)", "kb_variants"),
-		QObject::tr("Danish (Windows)", "kb_variants"),
-		QObject::tr("Danish (no dead keys)", "kb_variants"),
-		QObject::tr("Dutch (Macintosh)", "kb_variants"),
-		QObject::tr("Dutch (Sun dead keys)", "kb_variants"),
-		QObject::tr("Dutch (standard)", "kb_variants"),
-		QObject::tr("English (Canada)", "kb_variants"),
-		QObject::tr("English (Colemak)", "kb_variants"),
-		QObject::tr("English (Dvorak)", "kb_variants"),
-		QObject::tr("English (Dvorak, alt. intl.)", "kb_variants"),
-		QObject::tr("English (Dvorak, intl., with dead keys)", "kb_variants"),
-		QObject::tr("English (Dvorak, left-handed)", "kb_variants"),
-		QObject::tr("English (Dvorak, right-handed)", "kb_variants"),
-		QObject::tr("English (Ghana, GILLBT)", "kb_variants"),
-		QObject::tr("English (Ghana, multilingual)", "kb_variants"),
-		QObject::tr("English (India, with rupee)", "kb_variants"),
-		QObject::tr("English (Macintosh)", "kb_variants"),
-		QObject::tr("English (Mali, US, Macintosh)", "kb_variants"),
-		QObject::tr("English (Mali, US, intl.)", "kb_variants"),
-		QObject::tr("English (Norman)", "kb_variants"),
-		QObject::tr("English (UK, Colemak)", "kb_variants"),
-		QObject::tr("English (UK, Dvorak)", "kb_variants"),
-		QObject::tr("English (UK, Dvorak, with UK punctuation)", "kb_variants"),
-		QObject::tr("English (UK, Macintosh)", "kb_variants"),
-		QObject::tr("English (UK, Macintosh, intl.)", "kb_variants"),
-		QObject::tr("English (UK, extended, Windows)", "kb_variants"),
-		QObject::tr("English (UK, intl., with dead keys)", "kb_variants"),
-		QObject::tr("English (US, Symbolic)", "kb_variants"),
-		QObject::tr("English (US, alt. intl.)", "kb_variants"),
-		QObject::tr("English (US, euro on 5)", "kb_variants"),
-		QObject::tr("English (US, intl., with dead keys)", "kb_variants"),
-		QObject::tr("English (Workman)", "kb_variants"),
-		QObject::tr("English (Workman, intl., with dead keys)", "kb_variants"),
-		QObject::tr("English (classic Dvorak)", "kb_variants"),
-		QObject::tr("English (intl., with AltGr dead keys)", "kb_variants"),
-		QObject::tr("English (programmer Dvorak)", "kb_variants"),
-		QObject::tr("English (the divide/multiply toggle the layout)", "kb_variants"),
-		QObject::tr("Esperanto (Brazil, Nativo)", "kb_variants"),
-		QObject::tr("Esperanto (Portugal, Nativo)", "kb_variants"),
-		QObject::tr("Esperanto (legacy)", "kb_variants"),
-		QObject::tr("Estonian (Dvorak)", "kb_variants"),
-		QObject::tr("Estonian (US)", "kb_variants"),
-		QObject::tr("Estonian (no dead keys)", "kb_variants"),
-		QObject::tr("Ewe", "kb_variants"),
-		QObject::tr("Faroese (no dead keys)", "kb_variants"),
-		QObject::tr("Filipino (Capewell-Dvorak, Baybayin)", "kb_variants"),
-		QObject::tr("Filipino (Capewell-Dvorak, Latin)", "kb_variants"),
-		QObject::tr("Filipino (Capewell-QWERF 2006, Baybayin)", "kb_variants"),
-		QObject::tr("Filipino (Capewell-QWERF 2006, Latin)", "kb_variants"),
-		QObject::tr("Filipino (Colemak, Baybayin)", "kb_variants"),
-		QObject::tr("Filipino (Colemak, Latin)", "kb_variants"),
-		QObject::tr("Filipino (Dvorak, Baybayin)", "kb_variants"),
-		QObject::tr("Filipino (Dvorak, Latin)", "kb_variants"),
-		QObject::tr("Filipino (QWERTY, Baybayin)", "kb_variants"),
-		QObject::tr("Finnish (Macintosh)", "kb_variants"),
-		QObject::tr("Finnish (Windows)", "kb_variants"),
-		QObject::tr("Finnish (classic)", "kb_variants"),
-		QObject::tr("Finnish (classic, no dead keys)", "kb_variants"),
-		QObject::tr("French (AZERTY)", "kb_variants"),
-		QObject::tr("French (AZERTY, AFNOR)", "kb_variants"),
-		QObject::tr("French (BEPO)", "kb_variants"),
-		QObject::tr("French (BEPO, AFNOR)", "kb_variants"),
-		QObject::tr("French (BEPO, Latin-9 only)", "kb_variants"),
-		QObject::tr("French (Breton)", "kb_variants"),
-		QObject::tr("French (Cameroon)", "kb_variants"),
-		QObject::tr("French (Canada, Dvorak)", "kb_variants"),
-		QObject::tr("French (Canada, legacy)", "kb_variants"),
-		QObject::tr("French (Dvorak)", "kb_variants"),
-		QObject::tr("French (Macintosh)", "kb_variants"),
-		QObject::tr("French (Mali, alt.)", "kb_variants"),
-		QObject::tr("French (Morocco)", "kb_variants"),
-		QObject::tr("French (Sun dead keys)", "kb_variants"),
-		QObject::tr("French (Switzerland)", "kb_variants"),
-		QObject::tr("French (Switzerland, Macintosh)", "kb_variants"),
-		QObject::tr("French (Switzerland, Sun dead keys)", "kb_variants"),
-		QObject::tr("French (Switzerland, no dead keys)", "kb_variants"),
-		QObject::tr("French (US)", "kb_variants"),
-		QObject::tr("French (alt.)", "kb_variants"),
-		QObject::tr("French (alt., Latin-9 only)", "kb_variants"),
-		QObject::tr("French (alt., Sun dead keys)", "kb_variants"),
-		QObject::tr("French (alt., no dead keys)", "kb_variants"),
-		QObject::tr("French (legacy, alt.)", "kb_variants"),
-		QObject::tr("French (legacy, alt., Sun dead keys)", "kb_variants"),
-		QObject::tr("French (legacy, alt., no dead keys)", "kb_variants"),
-		QObject::tr("French (no dead keys)", "kb_variants"),
-		QObject::tr("Friulian (Italy)", "kb_variants"),
-		QObject::tr("Fula", "kb_variants"),
-		QObject::tr("Ga", "kb_variants"),
-		QObject::tr("Georgian (France, AZERTY Tskapo)", "kb_variants"),
-		QObject::tr("Georgian (Italy)", "kb_variants"),
-		QObject::tr("Georgian (MESS)", "kb_variants"),
-		QObject::tr("Georgian (ergonomic)", "kb_variants"),
-		QObject::tr("German (Austria, Macintosh)", "kb_variants"),
-		QObject::tr("German (Austria, Sun dead keys)", "kb_variants"),
-		QObject::tr("German (Austria, no dead keys)", "kb_variants"),
-		QObject::tr("German (Dvorak)", "kb_variants"),
-		QObject::tr("German (E1)", "kb_variants"),
-		QObject::tr("German (E2)", "kb_variants"),
-		QObject::tr("German (Macintosh)", "kb_variants"),
-		QObject::tr("German (Macintosh, no dead keys)", "kb_variants"),
-		QObject::tr("German (Neo 2)", "kb_variants"),
-		QObject::tr("German (QWERTY)", "kb_variants"),
-		QObject::tr("German (Sun dead keys)", "kb_variants"),
-		QObject::tr("German (Switzerland, Macintosh)", "kb_variants"),
-		QObject::tr("German (Switzerland, Sun dead keys)", "kb_variants"),
-		QObject::tr("German (Switzerland, legacy)", "kb_variants"),
-		QObject::tr("German (Switzerland, no dead keys)", "kb_variants"),
-		QObject::tr("German (T3)", "kb_variants"),
-		QObject::tr("German (US)", "kb_variants"),
-		QObject::tr("German (dead acute)", "kb_variants"),
-		QObject::tr("German (dead grave acute)", "kb_variants"),
-		QObject::tr("German (dead tilde)", "kb_variants"),
-		QObject::tr("German (no dead keys)", "kb_variants"),
-		QObject::tr("Greek (extended)", "kb_variants"),
-		QObject::tr("Greek (no dead keys)", "kb_variants"),
-		QObject::tr("Greek (polytonic)", "kb_variants"),
-		QObject::tr("Greek (simple)", "kb_variants"),
-		QObject::tr("Gujarati", "kb_variants"),
-		QObject::tr("Hanyu Pinyin (with AltGr dead keys)", "kb_variants"),
-		QObject::tr("Hausa (Ghana)", "kb_variants"),
-		QObject::tr("Hausa (Nigeria)", "kb_variants"),
-		QObject::tr("Hawaiian", "kb_variants"),
-		QObject::tr("Hebrew (Biblical, Tiro)", "kb_variants"),
-		QObject::tr("Hebrew (lyx)", "kb_variants"),
-		QObject::tr("Hebrew (phonetic)", "kb_variants"),
-		QObject::tr("Hindi (Bolnagri)", "kb_variants"),
-		QObject::tr("Hindi (KaGaPa, phonetic)", "kb_variants"),
-		QObject::tr("Hindi (Wx)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTY)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTY, 101-key, comma, dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTY, 101-key, comma, no dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTY, 101-key, dot, dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTY, 101-key, dot, no dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTY, 102-key, comma, dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTY, 102-key, comma, no dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTY, 102-key, dot, dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTY, 102-key, dot, no dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTZ, 101-key, comma, dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTZ, 101-key, comma, no dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTZ, 101-key, dot, dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTZ, 101-key, dot, no dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTZ, 102-key, comma, dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTZ, 102-key, comma, no dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTZ, 102-key, dot, dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (QWERTZ, 102-key, dot, no dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (no dead keys)", "kb_variants"),
-		QObject::tr("Hungarian (standard)", "kb_variants"),
-		QObject::tr("Icelandic (Dvorak)", "kb_variants"),
-		QObject::tr("Icelandic (Macintosh)", "kb_variants"),
-		QObject::tr("Icelandic (Macintosh, legacy)", "kb_variants"),
-		QObject::tr("Icelandic (Sun dead keys)", "kb_variants"),
-		QObject::tr("Icelandic (no dead keys)", "kb_variants"),
-		QObject::tr("Igbo", "kb_variants"),
-		QObject::tr("Indic (phonetic, IPA)", "kb_variants"),
-		QObject::tr("Indonesian (Arab Melayu, extended phonetic)", "kb_variants"),
-		QObject::tr("Inuktitut", "kb_variants"),
-		QObject::tr("Irish (UnicodeExpert)", "kb_variants"),
-		QObject::tr("Italian (IBM 142)", "kb_variants"),
-		QObject::tr("Italian (Macintosh)", "kb_variants"),
-		QObject::tr("Italian (US)", "kb_variants"),
-		QObject::tr("Italian (Windows)", "kb_variants"),
-		QObject::tr("Italian (intl., with dead keys)", "kb_variants"),
-		QObject::tr("Italian (no dead keys)", "kb_variants"),
-		QObject::tr("Japanese (Dvorak)", "kb_variants"),
-		QObject::tr("Japanese (Kana 86)", "kb_variants"),
-		QObject::tr("Japanese (Kana)", "kb_variants"),
-		QObject::tr("Japanese (Macintosh)", "kb_variants"),
-		QObject::tr("Japanese (OADG 109A)", "kb_variants"),
-		QObject::tr("Kabylian (Algeria, Tifinagh)", "kb_variants"),
-		QObject::tr("Kabylian (azerty layout, with dead keys)", "kb_variants"),
-		QObject::tr("Kabylian (qwerty-gb layout, with dead keys)", "kb_variants"),
-		QObject::tr("Kabylian (qwerty-us layout, with dead keys)", "kb_variants"),
-		QObject::tr("Kalmyk", "kb_variants"),
-		QObject::tr("Kannada", "kb_variants"),
-		QObject::tr("Kannada (KaGaPa, phonetic)", "kb_variants"),
-		QObject::tr("Kashubian", "kb_variants"),
-		QObject::tr("Kazakh (Latin)", "kb_variants"),
-		QObject::tr("Kazakh (extended)", "kb_variants"),
-		QObject::tr("Kazakh (with Russian)", "kb_variants"),
-		QObject::tr("Kikuyu", "kb_variants"),
-		QObject::tr("Komi", "kb_variants"),
-		QObject::tr("Korean (101/104-key compatible)", "kb_variants"),
-		QObject::tr("Kurdish (Iran, Arabic-Latin)", "kb_variants"),
-		QObject::tr("Kurdish (Iran, F)", "kb_variants"),
-		QObject::tr("Kurdish (Iran, Latin Alt-Q)", "kb_variants"),
-		QObject::tr("Kurdish (Iran, Latin Q)", "kb_variants"),
-		QObject::tr("Kurdish (Iraq, Arabic-Latin)", "kb_variants"),
-		QObject::tr("Kurdish (Iraq, F)", "kb_variants"),
-		QObject::tr("Kurdish (Iraq, Latin Alt-Q)", "kb_variants"),
-		QObject::tr("Kurdish (Iraq, Latin Q)", "kb_variants"),
-		QObject::tr("Kurdish (Syria, F)", "kb_variants"),
-		QObject::tr("Kurdish (Syria, Latin Alt-Q)", "kb_variants"),
-		QObject::tr("Kurdish (Syria, Latin Q)", "kb_variants"),
-		QObject::tr("Kurdish (Turkey, F)", "kb_variants"),
-		QObject::tr("Kurdish (Turkey, Latin Alt-Q)", "kb_variants"),
-		QObject::tr("Kurdish (Turkey, Latin Q)", "kb_variants"),
-		QObject::tr("Kyrgyz (phonetic)", "kb_variants"),
-		QObject::tr("Lao (STEA)", "kb_variants"),
-		QObject::tr("Latvian (F)", "kb_variants"),
-		QObject::tr("Latvian (adapted)", "kb_variants"),
-		QObject::tr("Latvian (apostrophe)", "kb_variants"),
-		QObject::tr("Latvian (ergonomic, ŪGJRMV)", "kb_variants"),
-		QObject::tr("Latvian (modern)", "kb_variants"),
-		QObject::tr("Latvian (tilde)", "kb_variants"),
-		QObject::tr("Lithuanian (IBM LST 1205-92)", "kb_variants"),
-		QObject::tr("Lithuanian (LEKP)", "kb_variants"),
-		QObject::tr("Lithuanian (LEKPa)", "kb_variants"),
-		QObject::tr("Lithuanian (US)", "kb_variants"),
-		QObject::tr("Lithuanian (standard)", "kb_variants"),
-		QObject::tr("Lower Sorbian", "kb_variants"),
-		QObject::tr("Lower Sorbian (QWERTZ)", "kb_variants"),
-		QObject::tr("Macedonian (no dead keys)", "kb_variants"),
-		QObject::tr("Malay (Jawi, phonetic)", "kb_variants"),
-		QObject::tr("Malayalam", "kb_variants"),
-		QObject::tr("Malayalam (Lalitha)", "kb_variants"),
-		QObject::tr("Malayalam (enhanced Inscript, with rupee)", "kb_variants"),
-		QObject::tr("Maltese (UK, with AltGr overrides)", "kb_variants"),
-		QObject::tr("Maltese (US layout with AltGr overrides)", "kb_variants"),
-		QObject::tr("Maltese (US)", "kb_variants"),
-		QObject::tr("Manipuri (Eeyek)", "kb_variants"),
-		QObject::tr("Marathi (KaGaPa, phonetic)", "kb_variants"),
-		QObject::tr("Marathi (enhanced Inscript)", "kb_variants"),
-		QObject::tr("Mari", "kb_variants"),
-		QObject::tr("Mmuock", "kb_variants"),
-		QObject::tr("Moldavian (Gagauz)", "kb_variants"),
-		QObject::tr("Mongolian (Bichig)", "kb_variants"),
-		QObject::tr("Mongolian (Galik)", "kb_variants"),
-		QObject::tr("Mongolian (Manchu Galik)", "kb_variants"),
-		QObject::tr("Mongolian (Manchu)", "kb_variants"),
-		QObject::tr("Mongolian (Todo Galik)", "kb_variants"),
-		QObject::tr("Mongolian (Todo)", "kb_variants"),
-		QObject::tr("Mongolian (Xibe)", "kb_variants"),
-		QObject::tr("Montenegrin (Cyrillic)", "kb_variants"),
-		QObject::tr("Montenegrin (Cyrillic, ZE and ZHE swapped)", "kb_variants"),
-		QObject::tr("Montenegrin (Cyrillic, with guillemets)", "kb_variants"),
-		QObject::tr("Montenegrin (Latin, QWERTY)", "kb_variants"),
-		QObject::tr("Montenegrin (Latin, Unicode)", "kb_variants"),
-		QObject::tr("Montenegrin (Latin, Unicode, QWERTY)", "kb_variants"),
-		QObject::tr("Montenegrin (Latin, with guillemets)", "kb_variants"),
-		QObject::tr("Northern Saami (Finland)", "kb_variants"),
-		QObject::tr("Northern Saami (Norway)", "kb_variants"),
-		QObject::tr("Northern Saami (Norway, no dead keys)", "kb_variants"),
-		QObject::tr("Northern Saami (Sweden)", "kb_variants"),
-		QObject::tr("Norwegian (Colemak)", "kb_variants"),
-		QObject::tr("Norwegian (Dvorak)", "kb_variants"),
-		QObject::tr("Norwegian (Macintosh)", "kb_variants"),
-		QObject::tr("Norwegian (Macintosh, no dead keys)", "kb_variants"),
-		QObject::tr("Norwegian (Windows)", "kb_variants"),
-		QObject::tr("Norwegian (no dead keys)", "kb_variants"),
-		QObject::tr("Occitan", "kb_variants"),
-		QObject::tr("Ogham", "kb_variants"),
-		QObject::tr("Ogham (IS434)", "kb_variants"),
-		QObject::tr("Ol Chiki", "kb_variants"),
-		QObject::tr("Oriya", "kb_variants"),
-		QObject::tr("Ossetian (Georgia)", "kb_variants"),
-		QObject::tr("Ossetian (Windows)", "kb_variants"),
-		QObject::tr("Ossetian (legacy)", "kb_variants"),
-		QObject::tr("Pannonian Rusyn", "kb_variants"),
-		QObject::tr("Pashto", "kb_variants"),
-		QObject::tr("Pashto (Afghanistan, OLPC)", "kb_variants"),
-		QObject::tr("Persian (Afghanistan, Dari OLPC)", "kb_variants"),
-		QObject::tr("Persian (with Persian keypad)", "kb_variants"),
-		QObject::tr("Polish (British keyboard)", "kb_variants"),
-		QObject::tr("Polish (Dvorak)", "kb_variants"),
-		QObject::tr("Polish (Dvorak, with Polish quotes on key 1)", "kb_variants"),
-		QObject::tr("Polish (Dvorak, with Polish quotes on quotemark key)", "kb_variants"),
-		QObject::tr("Polish (QWERTZ)", "kb_variants"),
-		QObject::tr("Polish (legacy)", "kb_variants"),
-		QObject::tr("Polish (programmer Dvorak)", "kb_variants"),
-		QObject::tr("Portuguese (Brazil, Dvorak)", "kb_variants"),
-		QObject::tr("Portuguese (Brazil, IBM/Lenovo ThinkPad)", "kb_variants"),
-		QObject::tr("Portuguese (Brazil, Nativo for US keyboards)", "kb_variants"),
-		QObject::tr("Portuguese (Brazil, Nativo)", "kb_variants"),
-		QObject::tr("Portuguese (Brazil, no dead keys)", "kb_variants"),
-		QObject::tr("Portuguese (Macintosh)", "kb_variants"),
-		QObject::tr("Portuguese (Macintosh, Sun dead keys)", "kb_variants"),
-		QObject::tr("Portuguese (Macintosh, no dead keys)", "kb_variants"),
-		QObject::tr("Portuguese (Nativo for US keyboards)", "kb_variants"),
-		QObject::tr("Portuguese (Nativo)", "kb_variants"),
-		QObject::tr("Portuguese (Sun dead keys)", "kb_variants"),
-		QObject::tr("Portuguese (no dead keys)", "kb_variants"),
-		QObject::tr("Punjabi (Gurmukhi Jhelum)", "kb_variants"),
-		QObject::tr("Punjabi (Gurmukhi)", "kb_variants"),
-		QObject::tr("Romanian (Germany)", "kb_variants"),
-		QObject::tr("Romanian (Germany, no dead keys)", "kb_variants"),
-		QObject::tr("Romanian (Windows)", "kb_variants"),
-		QObject::tr("Romanian (cedilla)", "kb_variants"),
-		QObject::tr("Romanian (standard cedilla)", "kb_variants"),
-		QObject::tr("Romanian (standard)", "kb_variants"),
-		QObject::tr("Russian (Belarus)", "kb_variants"),
-		QObject::tr("Russian (Czech, phonetic)", "kb_variants"),
-		QObject::tr("Russian (DOS)", "kb_variants"),
-		QObject::tr("Russian (Georgia)", "kb_variants"),
-		QObject::tr("Russian (Germany, phonetic)", "kb_variants"),
-		QObject::tr("Russian (Kazakhstan, with Kazakh)", "kb_variants"),
-		QObject::tr("Russian (Macintosh)", "kb_variants"),
-		QObject::tr("Russian (Poland, phonetic Dvorak)", "kb_variants"),
-		QObject::tr("Russian (Sweden, phonetic)", "kb_variants"),
-		QObject::tr("Russian (Sweden, phonetic, no dead keys)", "kb_variants"),
-		QObject::tr("Russian (US, phonetic)", "kb_variants"),
-		QObject::tr("Russian (Ukraine, standard RSTU)", "kb_variants"),
-		QObject::tr("Russian (legacy)", "kb_variants"),
-		QObject::tr("Russian (phonetic)", "kb_variants"),
-		QObject::tr("Russian (phonetic, AZERTY)", "kb_variants"),
-		QObject::tr("Russian (phonetic, Dvorak)", "kb_variants"),
-		QObject::tr("Russian (phonetic, French)", "kb_variants"),
-		QObject::tr("Russian (phonetic, Windows)", "kb_variants"),
-		QObject::tr("Russian (phonetic, YAZHERTY)", "kb_variants"),
-		QObject::tr("Russian (typewriter)", "kb_variants"),
-		QObject::tr("Russian (typewriter, legacy)", "kb_variants"),
-		QObject::tr("Saisiyat (Taiwan)", "kb_variants"),
-		QObject::tr("Samogitian", "kb_variants"),
-		QObject::tr("Sanskrit (KaGaPa, phonetic)", "kb_variants"),
-		QObject::tr("Serbian (Cyrillic, ZE and ZHE swapped)", "kb_variants"),
-		QObject::tr("Serbian (Cyrillic, with guillemets)", "kb_variants"),
-		QObject::tr("Serbian (Latin)", "kb_variants"),
-		QObject::tr("Serbian (Latin, QWERTY)", "kb_variants"),
-		QObject::tr("Serbian (Latin, Unicode)", "kb_variants"),
-		QObject::tr("Serbian (Latin, Unicode, QWERTY)", "kb_variants"),
-		QObject::tr("Serbian (Latin, with guillemets)", "kb_variants"),
-		QObject::tr("Serbian (Russia)", "kb_variants"),
-		QObject::tr("Serbo-Croatian (US)", "kb_variants"),
-		QObject::tr("Sicilian", "kb_variants"),
-		QObject::tr("Silesian", "kb_variants"),
-		QObject::tr("Sindhi", "kb_variants"),
-		QObject::tr("Sinhala (US)", "kb_variants"),
-		QObject::tr("Slovak (QWERTY)", "kb_variants"),
-		QObject::tr("Slovak (QWERTY, extended backslash)", "kb_variants"),
-		QObject::tr("Slovak (extended backslash)", "kb_variants"),
-		QObject::tr("Slovenian (US)", "kb_variants"),
-		QObject::tr("Slovenian (with guillemets)", "kb_variants"),
-		QObject::tr("Spanish (Dvorak)", "kb_variants"),
-		QObject::tr("Spanish (Latin American, Colemak for gaming)", "kb_variants"),
-		QObject::tr("Spanish (Latin American, Colemak)", "kb_variants"),
-		QObject::tr("Spanish (Latin American, Dvorak)", "kb_variants"),
-		QObject::tr("Spanish (Latin American, Sun dead keys)", "kb_variants"),
-		QObject::tr("Spanish (Latin American, dead tilde)", "kb_variants"),
-		QObject::tr("Spanish (Latin American, no dead keys)", "kb_variants"),
-		QObject::tr("Spanish (Macintosh)", "kb_variants"),
-		QObject::tr("Spanish (Sun dead keys)", "kb_variants"),
-		QObject::tr("Spanish (Windows)", "kb_variants"),
-		QObject::tr("Spanish (dead tilde)", "kb_variants"),
-		QObject::tr("Spanish (no dead keys)", "kb_variants"),
-		QObject::tr("Swedish (Dvorak)", "kb_variants"),
-		QObject::tr("Swedish (Dvorak, intl.)", "kb_variants"),
-		QObject::tr("Swedish (Macintosh)", "kb_variants"),
-		QObject::tr("Swedish (Svdvorak)", "kb_variants"),
-		QObject::tr("Swedish (US)", "kb_variants"),
-		QObject::tr("Swedish (no dead keys)", "kb_variants"),
-		QObject::tr("Swedish Sign Language", "kb_variants"),
-		QObject::tr("Syriac", "kb_variants"),
-		QObject::tr("Syriac (phonetic)", "kb_variants"),
-		QObject::tr("Taiwanese (indigenous)", "kb_variants"),
-		QObject::tr("Tajik (legacy)", "kb_variants"),
-		QObject::tr("Tamil (Inscript)", "kb_variants"),
-		QObject::tr("Tamil (Sri Lanka, TamilNet '99)", "kb_variants"),
-		QObject::tr("Tamil (Sri Lanka, TamilNet '99, TAB encoding)", "kb_variants"),
-		QObject::tr("Tamil (TamilNet '99 with Tamil numerals)", "kb_variants"),
-		QObject::tr("Tamil (TamilNet '99)", "kb_variants"),
-		QObject::tr("Tamil (TamilNet '99, TAB encoding)", "kb_variants"),
-		QObject::tr("Tamil (TamilNet '99, TSCII encoding)", "kb_variants"),
-		QObject::tr("Tatar", "kb_variants"),
-		QObject::tr("Telugu", "kb_variants"),
-		QObject::tr("Telugu (KaGaPa, phonetic)", "kb_variants"),
-		QObject::tr("Telugu (Sarala)", "kb_variants"),
-		QObject::tr("Thai (Pattachote)", "kb_variants"),
-		QObject::tr("Thai (TIS-820.2538)", "kb_variants"),
-		QObject::tr("Tibetan", "kb_variants"),
-		QObject::tr("Tibetan (with ASCII numerals)", "kb_variants"),
-		QObject::tr("Turkish (Alt-Q)", "kb_variants"),
-		QObject::tr("Turkish (F)", "kb_variants"),
-		QObject::tr("Turkish (Germany)", "kb_variants"),
-		QObject::tr("Turkish (Sun dead keys)", "kb_variants"),
-		QObject::tr("Turkish (intl., with dead keys)", "kb_variants"),
-		QObject::tr("Turkmen (Alt-Q)", "kb_variants"),
-		QObject::tr("Udmurt", "kb_variants"),
-		QObject::tr("Ukrainian (Windows)", "kb_variants"),
-		QObject::tr("Ukrainian (homophonic)", "kb_variants"),
-		QObject::tr("Ukrainian (legacy)", "kb_variants"),
-		QObject::tr("Ukrainian (phonetic)", "kb_variants"),
-		QObject::tr("Ukrainian (standard RSTU)", "kb_variants"),
-		QObject::tr("Ukrainian (typewriter)", "kb_variants"),
-		QObject::tr("Urdu (Pakistan, CRULP)", "kb_variants"),
-		QObject::tr("Urdu (Pakistan, NLA)", "kb_variants"),
-		QObject::tr("Urdu (Windows)", "kb_variants"),
-		QObject::tr("Urdu (alt. phonetic)", "kb_variants"),
-		QObject::tr("Urdu (phonetic)", "kb_variants"),
-		QObject::tr("Uyghur", "kb_variants"),
-		QObject::tr("Uzbek (Afghanistan)", "kb_variants"),
-		QObject::tr("Uzbek (Afghanistan, OLPC)", "kb_variants"),
-		QObject::tr("Uzbek (Latin)", "kb_variants"),
-		QObject::tr("Vietnamese (French)", "kb_variants"),
-		QObject::tr("Vietnamese (US)", "kb_variants"),
-		QObject::tr("Yakut", "kb_variants"),
-		QObject::tr("Yoruba", "kb_variants"),
+		tr("Akan", "kb_variants"),
+		tr("Albanian (Plisi)", "kb_variants"),
+		tr("Albanian (Veqilharxhi)", "kb_variants"),
+		tr("Arabic (AZERTY)", "kb_variants"),
+		tr("Arabic (AZERTY, Eastern Arabic numerals)", "kb_variants"),
+		tr("Arabic (Algeria)", "kb_variants"),
+		tr("Arabic (Buckwalter)", "kb_variants"),
+		tr("Arabic (Eastern Arabic numerals)", "kb_variants"),
+		tr("Arabic (Macintosh)", "kb_variants"),
+		tr("Arabic (OLPC)", "kb_variants"),
+		tr("Arabic (Pakistan)", "kb_variants"),
+		tr("Arabic (QWERTY)", "kb_variants"),
+		tr("Arabic (QWERTY, Eastern Arabic numerals)", "kb_variants"),
+		tr("Armenian (alt. eastern)", "kb_variants"),
+		tr("Armenian (alt. phonetic)", "kb_variants"),
+		tr("Armenian (eastern)", "kb_variants"),
+		tr("Armenian (phonetic)", "kb_variants"),
+		tr("Armenian (western)", "kb_variants"),
+		tr("Asturian (Spain, with bottom-dot H and L)", "kb_variants"),
+		tr("Avatime", "kb_variants"),
+		tr("Azerbaijani (Cyrillic)", "kb_variants"),
+		tr("Bangla (India)", "kb_variants"),
+		tr("Bangla (India, Baishakhi Inscript)", "kb_variants"),
+		tr("Bangla (India, Baishakhi)", "kb_variants"),
+		tr("Bangla (India, Bornona)", "kb_variants"),
+		tr("Bangla (India, Gitanjali)", "kb_variants"),
+		tr("Bangla (India, Probhat)", "kb_variants"),
+		tr("Bangla (Probhat)", "kb_variants"),
+		tr("Bashkirian", "kb_variants"),
+		tr("Belarusian (Latin)", "kb_variants"),
+		tr("Belarusian (intl.)", "kb_variants"),
+		tr("Belarusian (legacy)", "kb_variants"),
+		tr("Belgian (ISO, alt.)", "kb_variants"),
+		tr("Belgian (Latin-9 only, alt.)", "kb_variants"),
+		tr("Belgian (Sun dead keys)", "kb_variants"),
+		tr("Belgian (Sun dead keys, alt.)", "kb_variants"),
+		tr("Belgian (Wang 724 AZERTY)", "kb_variants"),
+		tr("Belgian (alt.)", "kb_variants"),
+		tr("Belgian (no dead keys)", "kb_variants"),
+		tr("Berber (Morocco, Tifinagh alt.)", "kb_variants"),
+		tr("Berber (Morocco, Tifinagh extended phonetic)", "kb_variants"),
+		tr("Berber (Morocco, Tifinagh extended)", "kb_variants"),
+		tr("Berber (Morocco, Tifinagh phonetic)", "kb_variants"),
+		tr("Berber (Morocco, Tifinagh phonetic, alt.)", "kb_variants"),
+		tr("Berber (Morocco, Tifinagh)", "kb_variants"),
+		tr("Bosnian (US)", "kb_variants"),
+		tr("Bosnian (US, with Bosnian digraphs)", "kb_variants"),
+		tr("Bosnian (with Bosnian digraphs)", "kb_variants"),
+		tr("Bosnian (with guillemets)", "kb_variants"),
+		tr("Braille (left-handed inverted thumb)", "kb_variants"),
+		tr("Braille (left-handed)", "kb_variants"),
+		tr("Braille (right-handed inverted thumb)", "kb_variants"),
+		tr("Braille (right-handed)", "kb_variants"),
+		tr("Bulgarian (enhanced)", "kb_variants"),
+		tr("Bulgarian (new phonetic)", "kb_variants"),
+		tr("Bulgarian (traditional phonetic)", "kb_variants"),
+		tr("Burmese Zawgyi", "kb_variants"),
+		tr("Cameroon (AZERTY, intl.)", "kb_variants"),
+		tr("Cameroon (Dvorak, intl.)", "kb_variants"),
+		tr("Cameroon Multilingual (QWERTY, intl.)", "kb_variants"),
+		tr("Canadian (intl.)", "kb_variants"),
+		tr("Canadian (intl., 1st part)", "kb_variants"),
+		tr("Canadian (intl., 2nd part)", "kb_variants"),
+		tr("Catalan (Spain, with middle-dot L)", "kb_variants"),
+		tr("Cherokee", "kb_variants"),
+		tr("Chuvash", "kb_variants"),
+		tr("Chuvash (Latin)", "kb_variants"),
+		tr("CloGaelach", "kb_variants"),
+		tr("Crimean Tatar (Turkish Alt-Q)", "kb_variants"),
+		tr("Crimean Tatar (Turkish F)", "kb_variants"),
+		tr("Crimean Tatar (Turkish Q)", "kb_variants"),
+		tr("Croatian (US)", "kb_variants"),
+		tr("Croatian (US, with Croatian digraphs)", "kb_variants"),
+		tr("Croatian (with Croatian digraphs)", "kb_variants"),
+		tr("Croatian (with guillemets)", "kb_variants"),
+		tr("Czech (QWERTY)", "kb_variants"),
+		tr("Czech (QWERTY, Macintosh)", "kb_variants"),
+		tr("Czech (QWERTY, extended backslash)", "kb_variants"),
+		tr("Czech (UCW, only accented letters)", "kb_variants"),
+		tr("Czech (US, Dvorak, UCW support)", "kb_variants"),
+		tr("Czech (with &lt;\|&gt; key)", "kb_variants"),
+		tr("Danish (Dvorak)", "kb_variants"),
+		tr("Danish (Macintosh)", "kb_variants"),
+		tr("Danish (Macintosh, no dead keys)", "kb_variants"),
+		tr("Danish (Windows)", "kb_variants"),
+		tr("Danish (no dead keys)", "kb_variants"),
+		tr("Default", "kb_variants"),
+		tr("Dutch (Macintosh)", "kb_variants"),
+		tr("Dutch (Sun dead keys)", "kb_variants"),
+		tr("Dutch (standard)", "kb_variants"),
+		tr("English (Canada)", "kb_variants"),
+		tr("English (Colemak)", "kb_variants"),
+		tr("English (Dvorak)", "kb_variants"),
+		tr("English (Dvorak, alt. intl.)", "kb_variants"),
+		tr("English (Dvorak, intl., with dead keys)", "kb_variants"),
+		tr("English (Dvorak, left-handed)", "kb_variants"),
+		tr("English (Dvorak, right-handed)", "kb_variants"),
+		tr("English (Ghana, GILLBT)", "kb_variants"),
+		tr("English (Ghana, multilingual)", "kb_variants"),
+		tr("English (India, with rupee)", "kb_variants"),
+		tr("English (Macintosh)", "kb_variants"),
+		tr("English (Mali, US, Macintosh)", "kb_variants"),
+		tr("English (Mali, US, intl.)", "kb_variants"),
+		tr("English (Norman)", "kb_variants"),
+		tr("English (UK, Colemak)", "kb_variants"),
+		tr("English (UK, Dvorak)", "kb_variants"),
+		tr("English (UK, Dvorak, with UK punctuation)", "kb_variants"),
+		tr("English (UK, Macintosh)", "kb_variants"),
+		tr("English (UK, Macintosh, intl.)", "kb_variants"),
+		tr("English (UK, extended, Windows)", "kb_variants"),
+		tr("English (UK, intl., with dead keys)", "kb_variants"),
+		tr("English (US, Symbolic)", "kb_variants"),
+		tr("English (US, alt. intl.)", "kb_variants"),
+		tr("English (US, euro on 5)", "kb_variants"),
+		tr("English (US, intl., with dead keys)", "kb_variants"),
+		tr("English (Workman)", "kb_variants"),
+		tr("English (Workman, intl., with dead keys)", "kb_variants"),
+		tr("English (classic Dvorak)", "kb_variants"),
+		tr("English (intl., with AltGr dead keys)", "kb_variants"),
+		tr("English (programmer Dvorak)", "kb_variants"),
+		tr("English (the divide/multiply toggle the layout)", "kb_variants"),
+		tr("Esperanto (Brazil, Nativo)", "kb_variants"),
+		tr("Esperanto (Portugal, Nativo)", "kb_variants"),
+		tr("Esperanto (legacy)", "kb_variants"),
+		tr("Estonian (Dvorak)", "kb_variants"),
+		tr("Estonian (US)", "kb_variants"),
+		tr("Estonian (no dead keys)", "kb_variants"),
+		tr("Ewe", "kb_variants"),
+		tr("Faroese (no dead keys)", "kb_variants"),
+		tr("Filipino (Capewell-Dvorak, Baybayin)", "kb_variants"),
+		tr("Filipino (Capewell-Dvorak, Latin)", "kb_variants"),
+		tr("Filipino (Capewell-QWERF 2006, Baybayin)", "kb_variants"),
+		tr("Filipino (Capewell-QWERF 2006, Latin)", "kb_variants"),
+		tr("Filipino (Colemak, Baybayin)", "kb_variants"),
+		tr("Filipino (Colemak, Latin)", "kb_variants"),
+		tr("Filipino (Dvorak, Baybayin)", "kb_variants"),
+		tr("Filipino (Dvorak, Latin)", "kb_variants"),
+		tr("Filipino (QWERTY, Baybayin)", "kb_variants"),
+		tr("Finnish (Macintosh)", "kb_variants"),
+		tr("Finnish (Windows)", "kb_variants"),
+		tr("Finnish (classic)", "kb_variants"),
+		tr("Finnish (classic, no dead keys)", "kb_variants"),
+		tr("French (AZERTY)", "kb_variants"),
+		tr("French (AZERTY, AFNOR)", "kb_variants"),
+		tr("French (BEPO)", "kb_variants"),
+		tr("French (BEPO, AFNOR)", "kb_variants"),
+		tr("French (BEPO, Latin-9 only)", "kb_variants"),
+		tr("French (Breton)", "kb_variants"),
+		tr("French (Cameroon)", "kb_variants"),
+		tr("French (Canada, Dvorak)", "kb_variants"),
+		tr("French (Canada, legacy)", "kb_variants"),
+		tr("French (Dvorak)", "kb_variants"),
+		tr("French (Macintosh)", "kb_variants"),
+		tr("French (Mali, alt.)", "kb_variants"),
+		tr("French (Morocco)", "kb_variants"),
+		tr("French (Sun dead keys)", "kb_variants"),
+		tr("French (Switzerland)", "kb_variants"),
+		tr("French (Switzerland, Macintosh)", "kb_variants"),
+		tr("French (Switzerland, Sun dead keys)", "kb_variants"),
+		tr("French (Switzerland, no dead keys)", "kb_variants"),
+		tr("French (US)", "kb_variants"),
+		tr("French (alt.)", "kb_variants"),
+		tr("French (alt., Latin-9 only)", "kb_variants"),
+		tr("French (alt., Sun dead keys)", "kb_variants"),
+		tr("French (alt., no dead keys)", "kb_variants"),
+		tr("French (legacy, alt.)", "kb_variants"),
+		tr("French (legacy, alt., Sun dead keys)", "kb_variants"),
+		tr("French (legacy, alt., no dead keys)", "kb_variants"),
+		tr("French (no dead keys)", "kb_variants"),
+		tr("Friulian (Italy)", "kb_variants"),
+		tr("Fula", "kb_variants"),
+		tr("Ga", "kb_variants"),
+		tr("Georgian (France, AZERTY Tskapo)", "kb_variants"),
+		tr("Georgian (Italy)", "kb_variants"),
+		tr("Georgian (MESS)", "kb_variants"),
+		tr("Georgian (ergonomic)", "kb_variants"),
+		tr("German (Austria, Macintosh)", "kb_variants"),
+		tr("German (Austria, Sun dead keys)", "kb_variants"),
+		tr("German (Austria, no dead keys)", "kb_variants"),
+		tr("German (Dvorak)", "kb_variants"),
+		tr("German (E1)", "kb_variants"),
+		tr("German (E2)", "kb_variants"),
+		tr("German (Macintosh)", "kb_variants"),
+		tr("German (Macintosh, no dead keys)", "kb_variants"),
+		tr("German (Neo 2)", "kb_variants"),
+		tr("German (QWERTY)", "kb_variants"),
+		tr("German (Sun dead keys)", "kb_variants"),
+		tr("German (Switzerland, Macintosh)", "kb_variants"),
+		tr("German (Switzerland, Sun dead keys)", "kb_variants"),
+		tr("German (Switzerland, legacy)", "kb_variants"),
+		tr("German (Switzerland, no dead keys)", "kb_variants"),
+		tr("German (T3)", "kb_variants"),
+		tr("German (US)", "kb_variants"),
+		tr("German (dead acute)", "kb_variants"),
+		tr("German (dead grave acute)", "kb_variants"),
+		tr("German (dead tilde)", "kb_variants"),
+		tr("German (no dead keys)", "kb_variants"),
+		tr("Greek (extended)", "kb_variants"),
+		tr("Greek (no dead keys)", "kb_variants"),
+		tr("Greek (polytonic)", "kb_variants"),
+		tr("Greek (simple)", "kb_variants"),
+		tr("Gujarati", "kb_variants"),
+		tr("Hanyu Pinyin (with AltGr dead keys)", "kb_variants"),
+		tr("Hausa (Ghana)", "kb_variants"),
+		tr("Hausa (Nigeria)", "kb_variants"),
+		tr("Hawaiian", "kb_variants"),
+		tr("Hebrew (Biblical, Tiro)", "kb_variants"),
+		tr("Hebrew (lyx)", "kb_variants"),
+		tr("Hebrew (phonetic)", "kb_variants"),
+		tr("Hindi (Bolnagri)", "kb_variants"),
+		tr("Hindi (KaGaPa, phonetic)", "kb_variants"),
+		tr("Hindi (Wx)", "kb_variants"),
+		tr("Hungarian (QWERTY)", "kb_variants"),
+		tr("Hungarian (QWERTY, 101-key, comma, dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTY, 101-key, comma, no dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTY, 101-key, dot, dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTY, 101-key, dot, no dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTY, 102-key, comma, dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTY, 102-key, comma, no dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTY, 102-key, dot, dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTY, 102-key, dot, no dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTZ, 101-key, comma, dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTZ, 101-key, comma, no dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTZ, 101-key, dot, dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTZ, 101-key, dot, no dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTZ, 102-key, comma, dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTZ, 102-key, comma, no dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTZ, 102-key, dot, dead keys)", "kb_variants"),
+		tr("Hungarian (QWERTZ, 102-key, dot, no dead keys)", "kb_variants"),
+		tr("Hungarian (no dead keys)", "kb_variants"),
+		tr("Hungarian (standard)", "kb_variants"),
+		tr("Icelandic (Dvorak)", "kb_variants"),
+		tr("Icelandic (Macintosh)", "kb_variants"),
+		tr("Icelandic (Macintosh, legacy)", "kb_variants"),
+		tr("Icelandic (Sun dead keys)", "kb_variants"),
+		tr("Icelandic (no dead keys)", "kb_variants"),
+		tr("Igbo", "kb_variants"),
+		tr("Indic (phonetic, IPA)", "kb_variants"),
+		tr("Indonesian (Arab Melayu, extended phonetic)", "kb_variants"),
+		tr("Inuktitut", "kb_variants"),
+		tr("Irish (UnicodeExpert)", "kb_variants"),
+		tr("Italian (IBM 142)", "kb_variants"),
+		tr("Italian (Macintosh)", "kb_variants"),
+		tr("Italian (US)", "kb_variants"),
+		tr("Italian (Windows)", "kb_variants"),
+		tr("Italian (intl., with dead keys)", "kb_variants"),
+		tr("Italian (no dead keys)", "kb_variants"),
+		tr("Japanese (Dvorak)", "kb_variants"),
+		tr("Japanese (Kana 86)", "kb_variants"),
+		tr("Japanese (Kana)", "kb_variants"),
+		tr("Japanese (Macintosh)", "kb_variants"),
+		tr("Japanese (OADG 109A)", "kb_variants"),
+		tr("Kabylian (Algeria, Tifinagh)", "kb_variants"),
+		tr("Kabylian (azerty layout, with dead keys)", "kb_variants"),
+		tr("Kabylian (qwerty-gb layout, with dead keys)", "kb_variants"),
+		tr("Kabylian (qwerty-us layout, with dead keys)", "kb_variants"),
+		tr("Kalmyk", "kb_variants"),
+		tr("Kannada", "kb_variants"),
+		tr("Kannada (KaGaPa, phonetic)", "kb_variants"),
+		tr("Kashubian", "kb_variants"),
+		tr("Kazakh (Latin)", "kb_variants"),
+		tr("Kazakh (extended)", "kb_variants"),
+		tr("Kazakh (with Russian)", "kb_variants"),
+		tr("Kikuyu", "kb_variants"),
+		tr("Komi", "kb_variants"),
+		tr("Korean (101/104-key compatible)", "kb_variants"),
+		tr("Kurdish (Iran, Arabic-Latin)", "kb_variants"),
+		tr("Kurdish (Iran, F)", "kb_variants"),
+		tr("Kurdish (Iran, Latin Alt-Q)", "kb_variants"),
+		tr("Kurdish (Iran, Latin Q)", "kb_variants"),
+		tr("Kurdish (Iraq, Arabic-Latin)", "kb_variants"),
+		tr("Kurdish (Iraq, F)", "kb_variants"),
+		tr("Kurdish (Iraq, Latin Alt-Q)", "kb_variants"),
+		tr("Kurdish (Iraq, Latin Q)", "kb_variants"),
+		tr("Kurdish (Syria, F)", "kb_variants"),
+		tr("Kurdish (Syria, Latin Alt-Q)", "kb_variants"),
+		tr("Kurdish (Syria, Latin Q)", "kb_variants"),
+		tr("Kurdish (Turkey, F)", "kb_variants"),
+		tr("Kurdish (Turkey, Latin Alt-Q)", "kb_variants"),
+		tr("Kurdish (Turkey, Latin Q)", "kb_variants"),
+		tr("Kyrgyz (phonetic)", "kb_variants"),
+		tr("Lao (STEA)", "kb_variants"),
+		tr("Latvian (F)", "kb_variants"),
+		tr("Latvian (adapted)", "kb_variants"),
+		tr("Latvian (apostrophe)", "kb_variants"),
+		tr("Latvian (ergonomic, ŪGJRMV)", "kb_variants"),
+		tr("Latvian (modern)", "kb_variants"),
+		tr("Latvian (tilde)", "kb_variants"),
+		tr("Lithuanian (IBM LST 1205-92)", "kb_variants"),
+		tr("Lithuanian (LEKP)", "kb_variants"),
+		tr("Lithuanian (LEKPa)", "kb_variants"),
+		tr("Lithuanian (US)", "kb_variants"),
+		tr("Lithuanian (standard)", "kb_variants"),
+		tr("Lower Sorbian", "kb_variants"),
+		tr("Lower Sorbian (QWERTZ)", "kb_variants"),
+		tr("Macedonian (no dead keys)", "kb_variants"),
+		tr("Malay (Jawi, phonetic)", "kb_variants"),
+		tr("Malayalam", "kb_variants"),
+		tr("Malayalam (Lalitha)", "kb_variants"),
+		tr("Malayalam (enhanced Inscript, with rupee)", "kb_variants"),
+		tr("Maltese (UK, with AltGr overrides)", "kb_variants"),
+		tr("Maltese (US layout with AltGr overrides)", "kb_variants"),
+		tr("Maltese (US)", "kb_variants"),
+		tr("Manipuri (Eeyek)", "kb_variants"),
+		tr("Marathi (KaGaPa, phonetic)", "kb_variants"),
+		tr("Marathi (enhanced Inscript)", "kb_variants"),
+		tr("Mari", "kb_variants"),
+		tr("Mmuock", "kb_variants"),
+		tr("Moldavian (Gagauz)", "kb_variants"),
+		tr("Mongolian (Bichig)", "kb_variants"),
+		tr("Mongolian (Galik)", "kb_variants"),
+		tr("Mongolian (Manchu Galik)", "kb_variants"),
+		tr("Mongolian (Manchu)", "kb_variants"),
+		tr("Mongolian (Todo Galik)", "kb_variants"),
+		tr("Mongolian (Todo)", "kb_variants"),
+		tr("Mongolian (Xibe)", "kb_variants"),
+		tr("Montenegrin (Cyrillic)", "kb_variants"),
+		tr("Montenegrin (Cyrillic, ZE and ZHE swapped)", "kb_variants"),
+		tr("Montenegrin (Cyrillic, with guillemets)", "kb_variants"),
+		tr("Montenegrin (Latin, QWERTY)", "kb_variants"),
+		tr("Montenegrin (Latin, Unicode)", "kb_variants"),
+		tr("Montenegrin (Latin, Unicode, QWERTY)", "kb_variants"),
+		tr("Montenegrin (Latin, with guillemets)", "kb_variants"),
+		tr("Northern Saami (Finland)", "kb_variants"),
+		tr("Northern Saami (Norway)", "kb_variants"),
+		tr("Northern Saami (Norway, no dead keys)", "kb_variants"),
+		tr("Northern Saami (Sweden)", "kb_variants"),
+		tr("Norwegian (Colemak)", "kb_variants"),
+		tr("Norwegian (Dvorak)", "kb_variants"),
+		tr("Norwegian (Macintosh)", "kb_variants"),
+		tr("Norwegian (Macintosh, no dead keys)", "kb_variants"),
+		tr("Norwegian (Windows)", "kb_variants"),
+		tr("Norwegian (no dead keys)", "kb_variants"),
+		tr("Occitan", "kb_variants"),
+		tr("Ogham", "kb_variants"),
+		tr("Ogham (IS434)", "kb_variants"),
+		tr("Ol Chiki", "kb_variants"),
+		tr("Oriya", "kb_variants"),
+		tr("Ossetian (Georgia)", "kb_variants"),
+		tr("Ossetian (Windows)", "kb_variants"),
+		tr("Ossetian (legacy)", "kb_variants"),
+		tr("Pannonian Rusyn", "kb_variants"),
+		tr("Pashto", "kb_variants"),
+		tr("Pashto (Afghanistan, OLPC)", "kb_variants"),
+		tr("Persian (Afghanistan, Dari OLPC)", "kb_variants"),
+		tr("Persian (with Persian keypad)", "kb_variants"),
+		tr("Polish (British keyboard)", "kb_variants"),
+		tr("Polish (Dvorak)", "kb_variants"),
+		tr("Polish (Dvorak, with Polish quotes on key 1)", "kb_variants"),
+		tr("Polish (Dvorak, with Polish quotes on quotemark key)", "kb_variants"),
+		tr("Polish (QWERTZ)", "kb_variants"),
+		tr("Polish (legacy)", "kb_variants"),
+		tr("Polish (programmer Dvorak)", "kb_variants"),
+		tr("Portuguese (Brazil, Dvorak)", "kb_variants"),
+		tr("Portuguese (Brazil, IBM/Lenovo ThinkPad)", "kb_variants"),
+		tr("Portuguese (Brazil, Nativo for US keyboards)", "kb_variants"),
+		tr("Portuguese (Brazil, Nativo)", "kb_variants"),
+		tr("Portuguese (Brazil, no dead keys)", "kb_variants"),
+		tr("Portuguese (Macintosh)", "kb_variants"),
+		tr("Portuguese (Macintosh, Sun dead keys)", "kb_variants"),
+		tr("Portuguese (Macintosh, no dead keys)", "kb_variants"),
+		tr("Portuguese (Nativo for US keyboards)", "kb_variants"),
+		tr("Portuguese (Nativo)", "kb_variants"),
+		tr("Portuguese (Sun dead keys)", "kb_variants"),
+		tr("Portuguese (no dead keys)", "kb_variants"),
+		tr("Punjabi (Gurmukhi Jhelum)", "kb_variants"),
+		tr("Punjabi (Gurmukhi)", "kb_variants"),
+		tr("Romanian (Germany)", "kb_variants"),
+		tr("Romanian (Germany, no dead keys)", "kb_variants"),
+		tr("Romanian (Windows)", "kb_variants"),
+		tr("Romanian (cedilla)", "kb_variants"),
+		tr("Romanian (standard cedilla)", "kb_variants"),
+		tr("Romanian (standard)", "kb_variants"),
+		tr("Russian (Belarus)", "kb_variants"),
+		tr("Russian (Czech, phonetic)", "kb_variants"),
+		tr("Russian (DOS)", "kb_variants"),
+		tr("Russian (Georgia)", "kb_variants"),
+		tr("Russian (Germany, phonetic)", "kb_variants"),
+		tr("Russian (Kazakhstan, with Kazakh)", "kb_variants"),
+		tr("Russian (Macintosh)", "kb_variants"),
+		tr("Russian (Poland, phonetic Dvorak)", "kb_variants"),
+		tr("Russian (Sweden, phonetic)", "kb_variants"),
+		tr("Russian (Sweden, phonetic, no dead keys)", "kb_variants"),
+		tr("Russian (US, phonetic)", "kb_variants"),
+		tr("Russian (Ukraine, standard RSTU)", "kb_variants"),
+		tr("Russian (legacy)", "kb_variants"),
+		tr("Russian (phonetic)", "kb_variants"),
+		tr("Russian (phonetic, AZERTY)", "kb_variants"),
+		tr("Russian (phonetic, Dvorak)", "kb_variants"),
+		tr("Russian (phonetic, French)", "kb_variants"),
+		tr("Russian (phonetic, Windows)", "kb_variants"),
+		tr("Russian (phonetic, YAZHERTY)", "kb_variants"),
+		tr("Russian (typewriter)", "kb_variants"),
+		tr("Russian (typewriter, legacy)", "kb_variants"),
+		tr("Saisiyat (Taiwan)", "kb_variants"),
+		tr("Samogitian", "kb_variants"),
+		tr("Sanskrit (KaGaPa, phonetic)", "kb_variants"),
+		tr("Serbian (Cyrillic, ZE and ZHE swapped)", "kb_variants"),
+		tr("Serbian (Cyrillic, with guillemets)", "kb_variants"),
+		tr("Serbian (Latin)", "kb_variants"),
+		tr("Serbian (Latin, QWERTY)", "kb_variants"),
+		tr("Serbian (Latin, Unicode)", "kb_variants"),
+		tr("Serbian (Latin, Unicode, QWERTY)", "kb_variants"),
+		tr("Serbian (Latin, with guillemets)", "kb_variants"),
+		tr("Serbian (Russia)", "kb_variants"),
+		tr("Serbo-Croatian (US)", "kb_variants"),
+		tr("Sicilian", "kb_variants"),
+		tr("Silesian", "kb_variants"),
+		tr("Sindhi", "kb_variants"),
+		tr("Sinhala (US)", "kb_variants"),
+		tr("Slovak (QWERTY)", "kb_variants"),
+		tr("Slovak (QWERTY, extended backslash)", "kb_variants"),
+		tr("Slovak (extended backslash)", "kb_variants"),
+		tr("Slovenian (US)", "kb_variants"),
+		tr("Slovenian (with guillemets)", "kb_variants"),
+		tr("Spanish (Dvorak)", "kb_variants"),
+		tr("Spanish (Latin American, Colemak for gaming)", "kb_variants"),
+		tr("Spanish (Latin American, Colemak)", "kb_variants"),
+		tr("Spanish (Latin American, Dvorak)", "kb_variants"),
+		tr("Spanish (Latin American, Sun dead keys)", "kb_variants"),
+		tr("Spanish (Latin American, dead tilde)", "kb_variants"),
+		tr("Spanish (Latin American, no dead keys)", "kb_variants"),
+		tr("Spanish (Macintosh)", "kb_variants"),
+		tr("Spanish (Sun dead keys)", "kb_variants"),
+		tr("Spanish (Windows)", "kb_variants"),
+		tr("Spanish (dead tilde)", "kb_variants"),
+		tr("Spanish (no dead keys)", "kb_variants"),
+		tr("Swedish (Dvorak)", "kb_variants"),
+		tr("Swedish (Dvorak, intl.)", "kb_variants"),
+		tr("Swedish (Macintosh)", "kb_variants"),
+		tr("Swedish (Svdvorak)", "kb_variants"),
+		tr("Swedish (US)", "kb_variants"),
+		tr("Swedish (no dead keys)", "kb_variants"),
+		tr("Swedish Sign Language", "kb_variants"),
+		tr("Syriac", "kb_variants"),
+		tr("Syriac (phonetic)", "kb_variants"),
+		tr("Taiwanese (indigenous)", "kb_variants"),
+		tr("Tajik (legacy)", "kb_variants"),
+		tr("Tamil (Inscript)", "kb_variants"),
+		tr("Tamil (Sri Lanka, TamilNet '99)", "kb_variants"),
+		tr("Tamil (Sri Lanka, TamilNet '99, TAB encoding)", "kb_variants"),
+		tr("Tamil (TamilNet '99 with Tamil numerals)", "kb_variants"),
+		tr("Tamil (TamilNet '99)", "kb_variants"),
+		tr("Tamil (TamilNet '99, TAB encoding)", "kb_variants"),
+		tr("Tamil (TamilNet '99, TSCII encoding)", "kb_variants"),
+		tr("Tatar", "kb_variants"),
+		tr("Telugu", "kb_variants"),
+		tr("Telugu (KaGaPa, phonetic)", "kb_variants"),
+		tr("Telugu (Sarala)", "kb_variants"),
+		tr("Thai (Pattachote)", "kb_variants"),
+		tr("Thai (TIS-820.2538)", "kb_variants"),
+		tr("Tibetan", "kb_variants"),
+		tr("Tibetan (with ASCII numerals)", "kb_variants"),
+		tr("Turkish (Alt-Q)", "kb_variants"),
+		tr("Turkish (F)", "kb_variants"),
+		tr("Turkish (Germany)", "kb_variants"),
+		tr("Turkish (Sun dead keys)", "kb_variants"),
+		tr("Turkish (intl., with dead keys)", "kb_variants"),
+		tr("Turkmen (Alt-Q)", "kb_variants"),
+		tr("Udmurt", "kb_variants"),
+		tr("Ukrainian (Windows)", "kb_variants"),
+		tr("Ukrainian (homophonic)", "kb_variants"),
+		tr("Ukrainian (legacy)", "kb_variants"),
+		tr("Ukrainian (phonetic)", "kb_variants"),
+		tr("Ukrainian (standard RSTU)", "kb_variants"),
+		tr("Ukrainian (typewriter)", "kb_variants"),
+		tr("Urdu (Pakistan, CRULP)", "kb_variants"),
+		tr("Urdu (Pakistan, NLA)", "kb_variants"),
+		tr("Urdu (Windows)", "kb_variants"),
+		tr("Urdu (alt. phonetic)", "kb_variants"),
+		tr("Urdu (phonetic)", "kb_variants"),
+		tr("Uyghur", "kb_variants"),
+		tr("Uzbek (Afghanistan)", "kb_variants"),
+		tr("Uzbek (Afghanistan, OLPC)", "kb_variants"),
+		tr("Uzbek (Latin)", "kb_variants"),
+		tr("Vietnamese (French)", "kb_variants"),
+		tr("Vietnamese (US)", "kb_variants"),
+		tr("Yakut", "kb_variants"),
+		tr("Yoruba", "kb_variants"),
 		QString()
 	};
 }
+}
 
diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index f1e6a66c6..f412eb7e1 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -20,6 +20,18 @@
 
 static QTranslator* s_kbtranslator = nullptr;
 
+void
+retranslateKeyboardModels()
+{
+    cqDeleter< QTranslator > d{ s_kbtranslator };
+    if ( !s_kbtranslator )
+    {
+        s_kbtranslator = new QTranslator;
+    }
+    d.preserve = CalamaresUtils::loadTranslator( QLocale(), QStringLiteral("kb_"), s_kbtranslator );
+}
+
+
 XKBListModel::XKBListModel( QObject* parent )
     : QAbstractListModel( parent )
 {
diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index 9c83e41d8..99b204573 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -146,4 +146,8 @@ public:
     void setVariants( QMap< QString, QString > variants );
 };
 
+/** @brief Adjust to changes in application language.
+ */
+void retranslateKeyboardModels();
+
 #endif  // KEYBOARDLAYOUTMODEL_H
diff --git a/src/modules/keyboard/layout-extractor.py b/src/modules/keyboard/layout-extractor.py
index 74b42ea07..44b0d6b50 100644
--- a/src/modules/keyboard/layout-extractor.py
+++ b/src/modules/keyboard/layout-extractor.py
@@ -58,10 +58,11 @@ def scrape_file(file, modelsset, layoutsset, variantsset):
 def write_set(file, label, set):
     file.write("/* This returns a reference to local, which is a terrible idea.\n * Good thing it's not meant to be compiled.\n */\n")
     # Note {{ is an escaped { for Python string formatting
-    file.write("static const QStringList& {!s}_table()\n{{\n\treturn QStringList {{\n".format(label))
+    file.write("class {!s} : public QObject {{\nQ_OBJECT\npublic:\n".format(label))
+    file.write("\tconst QStringList& table()\n\t{\n\treturn QStringList {\n")
     for x in sorted(set):
-        file.write("""\t\tQObject::tr("{!s}", "{!s}"),\n""".format(x, label))
-    file.write("\t\tQString()\n\t};\n}\n\n")
+        file.write("""\t\ttr("{!s}", "{!s}"),\n""".format(x, label))
+    file.write("\t\tQString()\n\t};\n}\n}\n\n")
 
 cpp_header_comment = """/*   GENERATED FILE DO NOT EDIT
 *
@@ -84,6 +85,7 @@ if __name__ == "__main__":
     models=set()
     layouts=set()
     variants=set()
+    variants.add( "Default" )
     with open("/usr/local/share/X11/xkb/rules/base.lst", "r") as f:
         scrape_file(f, models, layouts, variants)
     with open("KeyboardData_p.cxxtr", "w") as f:

From 6863db0dc1bdaef80f39f267efdf5934d4d8355d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Nov 2020 14:19:06 +0100
Subject: [PATCH 146/228] [keyboard] Use the translations if they were loaded

---
 src/modules/keyboard/KeyboardLayoutModel.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index f412eb7e1..1894ec683 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -23,12 +23,11 @@ static QTranslator* s_kbtranslator = nullptr;
 void
 retranslateKeyboardModels()
 {
-    cqDeleter< QTranslator > d{ s_kbtranslator };
     if ( !s_kbtranslator )
     {
         s_kbtranslator = new QTranslator;
     }
-    d.preserve = CalamaresUtils::loadTranslator( QLocale(), QStringLiteral("kb_"), s_kbtranslator );
+    (void) CalamaresUtils::loadTranslator( QLocale(), QStringLiteral("kb_"), s_kbtranslator );
 }
 
 
@@ -59,10 +58,13 @@ XKBListModel::data( const QModelIndex& index, int role ) const
     switch ( role )
     {
     case LabelRole:
-        if ( s_kbtranslator && m_contextname )
+        if ( s_kbtranslator && !s_kbtranslator->isEmpty() && m_contextname )
         {
             auto s = s_kbtranslator->translate( m_contextname, item.label.toUtf8().data() );
-            cDebug() << "Translated" << item.label << "to" << s;
+            if ( !s.isEmpty() )
+            {
+                return s;
+            }
         }
         return item.label;
     case KeyRole:

From 47467543449ddc69d44b512371cc0b9814d0a0d5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Nov 2020 14:28:12 +0100
Subject: [PATCH 147/228] [keyboard] Translate layouts as well

---
 src/modules/keyboard/KeyboardLayoutModel.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 1894ec683..abac1cdc2 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -27,7 +27,7 @@ retranslateKeyboardModels()
     {
         s_kbtranslator = new QTranslator;
     }
-    (void) CalamaresUtils::loadTranslator( QLocale(), QStringLiteral("kb_"), s_kbtranslator );
+    (void)CalamaresUtils::loadTranslator( QLocale(), QStringLiteral( "kb_" ), s_kbtranslator );
 }
 
 
@@ -165,7 +165,18 @@ KeyboardLayoutModel::data( const QModelIndex& index, int role ) const
     switch ( role )
     {
     case Qt::DisplayRole:
-        return m_layouts.at( index.row() ).second.description;
+    {
+        auto description = m_layouts.at( index.row() ).second.description;
+        if ( s_kbtranslator && !s_kbtranslator->isEmpty() )
+        {
+            auto s = s_kbtranslator->translate( "kb_layouts", description.toUtf8().data() );
+            if ( !s.isEmpty() )
+            {
+                return s;
+            }
+        }
+        return description;
+    }
     case KeyboardVariantsRole:
         return QVariant::fromValue( m_layouts.at( index.row() ).second.variants );
     case KeyboardLayoutKeyRole:

From 0bad5469fc82e938ca8aaf5510a6cb4de463bd39 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Sun, 1 Nov 2020 17:59:41 +0100
Subject: [PATCH 148/228] [libcalamares] Fix tests failures from JobQueue
 asserts

Some compile flags changed recently, triggering assert()
in the jobqueue when there is more than one. There's no
real reason for JobQueue to be a singleton, but it wants
to be. So clean up pointers a little more enthusiastically.
---
 src/libcalamares/JobQueue.cpp                      | 1 +
 src/modules/partition/tests/CreateLayoutsTests.cpp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp
index 1637f0719..b66be7ebe 100644
--- a/src/libcalamares/JobQueue.cpp
+++ b/src/libcalamares/JobQueue.cpp
@@ -249,6 +249,7 @@ JobQueue::~JobQueue()
     }
 
     delete m_storage;
+    s_instance = nullptr;
 }
 
 
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index fb991fc82..4b76bb83a 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -25,6 +25,7 @@ class SmartStatus;
 QTEST_GUILESS_MAIN( CreateLayoutsTests )
 
 static CalamaresUtils::Partition::KPMManager* kpmcore = nullptr;
+static Calamares::JobQueue* jobqueue = nullptr;
 
 using CalamaresUtils::operator""_MiB;
 using CalamaresUtils::operator""_GiB;
@@ -39,7 +40,7 @@ CreateLayoutsTests::CreateLayoutsTests()
 void
 CreateLayoutsTests::init()
 {
-    std::unique_ptr< Calamares::JobQueue > jobqueue_p( new Calamares::JobQueue( nullptr ) );
+    jobqueue = new Calamares::JobQueue( nullptr );
     kpmcore = new CalamaresUtils::Partition::KPMManager();
 }
 
@@ -47,6 +48,7 @@ void
 CreateLayoutsTests::cleanup()
 {
     delete kpmcore;
+    delete jobqueue;
 }
 
 void

From 48eae463cc329e6a5f6303bbc7440bbb1cfc0557 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Sun, 1 Nov 2020 19:24:42 -0500
Subject: [PATCH 149/228] [users] Full name transliteration support for user
 creation

---
 src/modules/users/CMakeLists.txt  | 12 ++++++++++
 src/modules/users/Config.cpp      | 39 ++++++++++++++++++++++++++++++-
 src/modules/usersq/CMakeLists.txt | 12 ++++++++++
 3 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index fdae38440..56a61093b 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -21,6 +21,18 @@ if( LibPWQuality_FOUND )
     add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY )
 endif()
 
+find_package( ICU COMPONENTS uc i18n )
+set_package_properties(
+    ICU PROPERTIES
+    PURPOSE "Transliteration support for full name to username conversion"
+)
+
+if( ICU_FOUND )
+    list( APPEND USER_EXTRA_LIB ICU::uc ICU::i18n )
+    include_directories( ${ICU_INCLUDE_DIRS} )
+    add_definitions( -DHAVE_ICU )
+endif()
+
 include_directories( ${PROJECT_BINARY_DIR}/src/libcalamaresui )
 
 set( JOB_SRC
diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index f8904b9d4..186dd0ade 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -23,6 +23,11 @@
 #include <QFile>
 #include <QRegExp>
 
+#ifdef HAVE_ICU
+#include <unicode/translit.h>
+#include <unicode/unistr.h>
+#endif
+
 static const QRegExp USERNAME_RX( "^[a-z_][a-z0-9_-]*[$]?$" );
 static constexpr const int USERNAME_MAX_LENGTH = 31;
 
@@ -279,6 +284,30 @@ guessProductName()
     }
     return dmiProduct;
 }
+#ifdef HAVE_ICU
+static QString
+transliterate( const QString& input )
+{
+    static UErrorCode ue = UErrorCode::U_ZERO_ERROR;
+    static auto transliterator = std::unique_ptr< icu::Transliterator >(
+                icu::Transliterator::createInstance( "Any-Latin; Latin-ASCII", UTRANS_FORWARD, ue )
+                );
+
+    if(ue!=0){
+        cWarning() << "Can't create transliterator";
+
+        //it'll be checked later for non-ASCII characters
+        return input;
+    }
+
+    auto transliterable = icu::UnicodeString( input.toUtf8().data() );
+
+    transliterator->transliterate( transliterable );
+
+    return QString::fromUtf16( transliterable.getTerminatedBuffer() );
+
+}
+#endif
 
 static QString
 makeLoginNameSuggestion( const QStringList& parts )
@@ -337,8 +366,16 @@ Config::setFullName( const QString& name )
         emit fullNameChanged( name );
 
         // Build login and hostname, if needed
+        QString cleanName = CalamaresUtils::removeDiacritics( name ).toLower().simplified();
+
+#ifdef HAVE_ICU
+        cleanName = transliterate(cleanName);
+#else
         QRegExp rx( "[^a-zA-Z0-9 ]", Qt::CaseInsensitive );
-        QString cleanName = CalamaresUtils::removeDiacritics( name ).toLower().replace( rx, " " ).simplified();
+        cleanName.replace( rx, " " );
+#endif
+
+
         QStringList cleanParts = cleanName.split( ' ' );
 
         if ( !m_customLoginName )
diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt
index 26c270bfb..37b4416ad 100644
--- a/src/modules/usersq/CMakeLists.txt
+++ b/src/modules/usersq/CMakeLists.txt
@@ -29,6 +29,18 @@ if( LibPWQuality_FOUND )
     add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY )
 endif()
 
+find_package( ICU COMPONENTS uc i18n )
+set_package_properties(
+    ICU PROPERTIES
+    PURPOSE "Transliteration support for full name to username conversion"
+)
+
+if( ICU_FOUND )
+    list( APPEND USER_EXTRA_LIB ICU::uc ICU::i18n )
+    include_directories( ${ICU_INCLUDE_DIRS} )
+    add_definitions( -DHAVE_ICU )
+endif()
+
 calamares_add_plugin( usersq
     TYPE viewmodule
     EXPORT_MACRO PLUGINDLLEXPORT_PRO

From 8e07bb00f9b54b123565a891bfcadc806cd66d2a Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Mon, 2 Nov 2020 03:52:37 +0300
Subject: [PATCH 150/228] [users] Construct icu::UnicodeString from QString's
 utf16 chars directly

---
 src/modules/users/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 186dd0ade..63645764b 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -300,7 +300,7 @@ transliterate( const QString& input )
         return input;
     }
 
-    auto transliterable = icu::UnicodeString( input.toUtf8().data() );
+    auto transliterable = icu::UnicodeString( input.utf16() );
 
     transliterator->transliterate( transliterable );
 

From 4e54a2aefeb10d81ab034e4ff1f1b50eeba2fe27 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Mon, 2 Nov 2020 04:01:01 +0300
Subject: [PATCH 151/228] [users] Cleaned error handling a bit

---
 src/modules/users/Config.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 63645764b..59912a78b 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -288,12 +288,12 @@ guessProductName()
 static QString
 transliterate( const QString& input )
 {
-    static UErrorCode ue = UErrorCode::U_ZERO_ERROR;
+    static auto ue = UErrorCode::U_ZERO_ERROR;
     static auto transliterator = std::unique_ptr< icu::Transliterator >(
                 icu::Transliterator::createInstance( "Any-Latin; Latin-ASCII", UTRANS_FORWARD, ue )
                 );
 
-    if(ue!=0){
+    if( ue != UErrorCode::U_ZERO_ERROR ){
         cWarning() << "Can't create transliterator";
 
         //it'll be checked later for non-ASCII characters

From e66f81f6ee132a707d0ab2dc26afb9cd41dbe7db Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 2 Nov 2020 12:01:02 +0100
Subject: [PATCH 152/228] CMake: comment on BUILD_AS_TEST

---
 CMakeModules/CalamaresAddTest.cmake | 2 ++
 src/modules/users/Tests.cpp         | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CMakeModules/CalamaresAddTest.cmake b/CMakeModules/CalamaresAddTest.cmake
index 56a45d7dc..228d7cbc0 100644
--- a/CMakeModules/CalamaresAddTest.cmake
+++ b/CMakeModules/CalamaresAddTest.cmake
@@ -42,6 +42,8 @@ function( calamares_add_test )
                 Qt5::Test
             )
         calamares_automoc( ${TEST_NAME} )
+        # We specifically pass in the source directory of the test-being-
+        # compiled, so that it can find test-files in that source dir.
         target_compile_definitions( ${TEST_NAME} PRIVATE -DBUILD_AS_TEST="${CMAKE_CURRENT_SOURCE_DIR}"  ${TEST_DEFINITIONS} )
         if( TEST_GUI )
             target_link_libraries( ${TEST_NAME} calamaresui Qt5::Gui )
diff --git a/src/modules/users/Tests.cpp b/src/modules/users/Tests.cpp
index 5259fb8a8..b687a6434 100644
--- a/src/modules/users/Tests.cpp
+++ b/src/modules/users/Tests.cpp
@@ -196,6 +196,7 @@ UserTests::testDefaultGroupsYAML()
     QFETCH( int, count );
     QFETCH( QString, group );
 
+    // BUILD_AS_TEST is the source-directory path
     QFile fi( QString( "%1/%2" ).arg( BUILD_AS_TEST, filename ) );
     QVERIFY( fi.exists() );
 

From 8127ae704ca93a0fc2fb92106ea6bd456f993c17 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 2 Nov 2020 12:11:13 +0100
Subject: [PATCH 153/228] [users] Expand tests for groups a little

---
 src/modules/users/CMakeLists.txt           |  6 ++++-
 src/modules/users/TestGroupInformation.cpp | 28 +++++++++++++++++++++-
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index f2cb011f4..8b8e87080 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -77,7 +77,11 @@ calamares_add_test(
     usersgroupstest
     SOURCES
         TestGroupInformation.cpp
-        MiscJobs.cpp
+        ${_users_src}  # Build again with test-visibility
+    LIBRARIES
+        Qt5::DBus  # HostName job can use DBus to systemd
+        ${CRYPT_LIBRARIES}  # SetPassword job uses crypt()
+        ${USER_EXTRA_LIB}
 )
 
 calamares_add_test(
diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp
index 3b2046bda..5e8bcf9ab 100644
--- a/src/modules/users/TestGroupInformation.cpp
+++ b/src/modules/users/TestGroupInformation.cpp
@@ -7,11 +7,14 @@
  *
  */
 
+#include "Config.h"
 #include "CreateUserJob.h"
+#include "MiscJobs.h"
 
 #include "GlobalStorage.h"
 #include "JobQueue.h"
 #include "utils/Logger.h"
+#include "utils/Yaml.h"
 
 #include <QDir>
 #include <QtTest/QtTest>
@@ -30,6 +33,7 @@ private Q_SLOTS:
     void initTestCase();
 
     void testReadGroup();
+    void testCreateGroup();
 };
 
 GroupTests::GroupTests() {}
@@ -43,12 +47,12 @@ GroupTests::initTestCase()
     {
         (void)new Calamares::JobQueue();
     }
+    Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/" );
 }
 
 void
 GroupTests::testReadGroup()
 {
-    Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/" );
     // Get the groups in the host system
     QStringList groups = groupsInTargetSystem();
     QVERIFY( groups.count() > 2 );
@@ -69,6 +73,28 @@ GroupTests::testReadGroup()
     }
 }
 
+void GroupTests::testCreateGroup()
+{
+    Config g;
+
+    // BUILD_AS_TEST is the source-directory path
+    QFile fi( QString( "%1/tests/5-issue-1523.conf" ).arg( BUILD_AS_TEST ) );
+    QVERIFY( fi.exists() );
+
+    bool ok = false;
+    const auto map = CalamaresUtils::loadYaml( fi, &ok );
+    QVERIFY( ok );
+    QVERIFY( map.count() > 0 );  // Just that it loaded, one key *defaultGroups*
+
+    Config c;
+    c.setConfigurationMap( map );
+
+    QCOMPARE( c.defaultGroups().count(), 4 );
+    QVERIFY( c.defaultGroups().contains( QStringLiteral( "adm" ) ) );
+}
+
+
+
 QTEST_GUILESS_MAIN( GroupTests )
 
 #include "utils/moc-warnings.h"

From b61b5f8650bdb3f4b57d997baa20715e115ded28 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 2 Nov 2020 12:27:50 +0100
Subject: [PATCH 154/228] [users] Run an expected-to-fail test in creating
 groups

---
 src/modules/users/TestGroupInformation.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp
index 5e8bcf9ab..dd4bfe78f 100644
--- a/src/modules/users/TestGroupInformation.cpp
+++ b/src/modules/users/TestGroupInformation.cpp
@@ -75,8 +75,6 @@ GroupTests::testReadGroup()
 
 void GroupTests::testCreateGroup()
 {
-    Config g;
-
     // BUILD_AS_TEST is the source-directory path
     QFile fi( QString( "%1/tests/5-issue-1523.conf" ).arg( BUILD_AS_TEST ) );
     QVERIFY( fi.exists() );
@@ -91,6 +89,12 @@ void GroupTests::testCreateGroup()
 
     QCOMPARE( c.defaultGroups().count(), 4 );
     QVERIFY( c.defaultGroups().contains( QStringLiteral( "adm" ) ) );
+    QVERIFY( c.defaultGroups().contains( QStringLiteral( "bar" ) ) );
+
+    Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/" );
+
+    SetupGroupsJob j(&c);
+    QVERIFY( !j.exec() );  // running as regular user this should fail
 }
 
 

From 486cdaeeb6923a5819023ae18bf58e6c7afeec35 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 2 Nov 2020 14:10:35 +0100
Subject: [PATCH 155/228] [users] Shuffle library order to satisfy CI build

---
 CHANGES                           | 6 ++++--
 src/modules/users/CMakeLists.txt  | 3 ++-
 src/modules/usersq/CMakeLists.txt | 2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CHANGES b/CHANGES
index 73c99cf9b..85accf44d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -20,12 +20,14 @@ This release contains contributions from (alphabetically by first name):
  - Calamares now sets the C++ standard for compilation to C++17; this
    is for better compatibility and fewer warnings when building with
    modern KDE Frameworks and KPMcore 4.2.0.
- - Vietnamese translations have been added. Welcome!
+ - Vietnamese translations have been added. Welcome! (Thanks TTran)
 
 ## Modules ##
  - The *keyboard* and *keyboardq* modules now share backend code
    and handle non-ASCII layouts better (for setting passwords
-   and usernames).
+   and usernames). (Thanks Artem)
+ - Various cleanups and documentation improvements in the *partition*
+   module, and configurable GPT name for swap. (Thanks Gaël)
 
 
 # 3.2.32.1 (2020-10-17) #
diff --git a/src/modules/users/CMakeLists.txt b/src/modules/users/CMakeLists.txt
index 8b8e87080..92a9e03e7 100644
--- a/src/modules/users/CMakeLists.txt
+++ b/src/modules/users/CMakeLists.txt
@@ -44,6 +44,7 @@ calamares_add_library(
         ${_users_src}
     LINK_LIBRARIES
         Qt5::DBus
+        ${CRYPT_LIBRARIES}
 )
 
 calamares_add_plugin( users
@@ -57,10 +58,10 @@ calamares_add_plugin( users
     RESOURCES
         users.qrc
     LINK_PRIVATE_LIBRARIES
+        users_internal
         calamaresui
         ${CRYPT_LIBRARIES}
         ${USER_EXTRA_LIB}
-        users_internal
     SHARED_LIB
 )
 
diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt
index 951359c77..7e3fffb8d 100644
--- a/src/modules/usersq/CMakeLists.txt
+++ b/src/modules/usersq/CMakeLists.txt
@@ -36,10 +36,10 @@ calamares_add_plugin( usersq
     RESOURCES
         usersq.qrc
     LINK_PRIVATE_LIBRARIES
+        users_internal
         calamaresui
         ${CRYPT_LIBRARIES}
         ${USER_EXTRA_LIB}
         Qt5::DBus
-        users_internal
     SHARED_LIB
 )

From 1f9f506a16e26d6e41bad65fadb2cfdca47d5a8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Wed, 17 Jun 2020 14:16:20 -0400
Subject: [PATCH 156/228] [partition] Make mountPoint optional

Some devices cannot be mounted (as DM_verity_hash), therefore, it is
nosense to set a mountPoint for them.
---
 src/modules/partition/core/PartitionLayout.cpp | 3 +--
 src/modules/partition/partition.conf           | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 15b18da93..0b0c7bedf 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -134,8 +134,7 @@ PartitionLayout::init( const QVariantList& config )
     {
         QVariantMap pentry = r.toMap();
 
-        if ( !pentry.contains( "name" ) || !pentry.contains( "mountPoint" ) || !pentry.contains( "filesystem" )
-             || !pentry.contains( "size" ) )
+        if ( !pentry.contains( "name" ) || !pentry.contains( "filesystem" ) || !pentry.contains( "size" ) )
         {
             cError() << "Partition layout entry #" << config.indexOf( r )
                      << "lacks mandatory attributes, switching to default layout.";
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index 41652fe7d..ed2719ca7 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -208,7 +208,7 @@ defaultFileSystemType:  "ext4"
 #   - type: partition type (optional parameter; gpt only; requires KPMCore >= 4.2.0)
 #   - attributes: partition attributes (optional parameter; gpt only; requires KPMCore >= 4.2.0)
 #   - filesystem: filesystem type
-#   - mountPoint: partition mount point
+#   - mountPoint: partition mount point (optional parameter; not mounted if unset)
 #   - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB)
 #           or
 #           % of the available drive space if a '%' is appended to the value

From 54fd1f4b260fce83921116d93dd0c83848983e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Sat, 31 Oct 2020 04:44:49 -0400
Subject: [PATCH 157/228] [mount] Print a warning if mount failure

The return of the call to libcalamares.utils.mount is never tested and
it may fail silently; this causes some mounpoints to be missing.

This adds a warning if mountpoint cannot be mounted.

	chcon: failed to get security context of '/tmp/verity': Operation not supported
	06:44:23 [6]: static CalamaresUtils::ProcessResult CalamaresUtils::System::runCommand(CalamaresUtils::System::RunLocation, const QStringList&, const QString&, const QString&, std::chrono::seconds)
	    Running "env" ("mount", "-t", "unformatted", "/dev/sdb2", "/tmp/calamares-root-kv8dqgb5/tmp/verity")
	    ..  Finished. Exit code: 32
	    ..  Target cmd: ("mount", "-t", "unformatted", "/dev/sdb7", "/tmp/calamares-root-kv8dqgb5/tmp/verity") output:
	 mount: /tmp/calamares-root-kv8dqgb5/tmp/verity: unknown filesystem type 'unformatted'.
---
 src/modules/mount/main.py | 71 ++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 45 deletions(-)

diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index 01c0650bf..5ef7a2734 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -7,6 +7,7 @@
 #   SPDX-FileCopyrightText: 2017 Alf Gaida <agaida@siduction.org>
 #   SPDX-FileCopyrightText: 2019 Adriaan de Groot <groot@kde.org>
 #   SPDX-FileCopyrightText: 2019 Kevin Kofler <kevin.kofler@chello.at>
+#   SPDX-FileCopyrightText: 2019-2020 Collabora Ltd
 #   SPDX-License-Identifier: GPL-3.0-or-later
 #
 #   Calamares is Free Software: see the License-Identifier above.
@@ -56,22 +57,16 @@ def mount_partition(root_mount_point, partition, partitions):
     if fstype == "fat16" or fstype == "fat32":
         fstype = "vfat"
 
-    if "luksMapperName" in partition:
-        libcalamares.utils.debug(
-            "about to mount {!s}".format(partition["luksMapperName"]))
-        libcalamares.utils.mount(
-            "/dev/mapper/{!s}".format(partition["luksMapperName"]),
-            mount_point,
-            fstype,
-            partition.get("options", ""),
-            )
+    device = partition["device"]
 
-    else:
-        libcalamares.utils.mount(partition["device"],
-                                 mount_point,
-                                 fstype,
-                                 partition.get("options", ""),
-                                 )
+    if "luksMapperName" in partition:
+        device = os.path.join("/dev/mapper", partition["luksMapperName"])
+
+    if libcalamares.utils.mount(device,
+                                mount_point,
+                                fstype,
+                                partition.get("options", "")) != 0:
+        libcalamares.utils.warning("Cannot mount {}".format(device))
 
     # If the root partition is btrfs, we create a subvolume "@"
     # for the root mount point.
@@ -96,37 +91,23 @@ def mount_partition(root_mount_point, partition, partitions):
 
         subprocess.check_call(["umount", "-v", root_mount_point])
 
+        device = partition["device"]
+
         if "luksMapperName" in partition:
-            libcalamares.utils.mount(
-                "/dev/mapper/{!s}".format(partition["luksMapperName"]),
-                mount_point,
-                fstype,
-                ",".join(
-                    ["subvol=@", partition.get("options", "")]),
-                )
-            if not has_home_mount_point:
-                libcalamares.utils.mount(
-                    "/dev/mapper/{!s}".format(partition["luksMapperName"]),
-                    root_mount_point + "/home",
-                    fstype,
-                    ",".join(
-                        ["subvol=@home", partition.get("options", "")]),
-                    )
-        else:
-            libcalamares.utils.mount(
-                partition["device"],
-                mount_point,
-                fstype,
-                ",".join(["subvol=@", partition.get("options", "")]),
-                )
-            if not has_home_mount_point:
-                libcalamares.utils.mount(
-                    partition["device"],
-                    root_mount_point + "/home",
-                    fstype,
-                    ",".join(
-                        ["subvol=@home", partition.get("options", "")]),
-                    )
+            device = os.path.join("/dev/mapper", partition["luksMapperName"])
+
+        if libcalamares.utils.mount(device,
+                                    mount_point,
+                                    fstype,
+                                    ",".join(["subvol=@", partition.get("options", "")])) != 0:
+            libcalamares.utils.warning("Cannot mount {}".format(device))
+
+        if not has_home_mount_point:
+            if libcalamares.utils.mount(device,
+                                        root_mount_point + "/home",
+                                        fstype,
+                                        ",".join(["subvol=@home", partition.get("options", "")])) != 0:
+                libcalamares.utils.warning("Cannot mount {}".format(device))
 
 
 def run():

From c6feedf9230730ce62d80677fe89ff898495f977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Sat, 31 Oct 2020 07:18:30 -0400
Subject: [PATCH 158/228] [mount] Ignore empty mountpoints

---
 src/modules/mount/main.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index 5ef7a2734..2e4de44fa 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -39,6 +39,9 @@ def mount_partition(root_mount_point, partition, partitions):
     # Create mount point with `+` rather than `os.path.join()` because
     # `partition["mountPoint"]` starts with a '/'.
     raw_mount_point = partition["mountPoint"]
+    if not raw_mount_point:
+        return
+
     mount_point = root_mount_point + raw_mount_point
 
     # Ensure that the created directory has the correct SELinux context on

From 163351a803dc4b86d0ac21e0f74d2877fb885b4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Sat, 31 Oct 2020 07:19:53 -0400
Subject: [PATCH 159/228] [mount] Ignore empty or unformatted filesystems

---
 src/modules/mount/main.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index 2e4de44fa..71599a6de 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -56,6 +56,8 @@ def mount_partition(root_mount_point, partition, partitions):
         raise
 
     fstype = partition.get("fs", "").lower()
+    if not fstype or fstype == "unformatted":
+        return
 
     if fstype == "fat16" or fstype == "fat32":
         fstype = "vfat"

From db08d2db8ba31f183d5a538fd838e8b318b18842 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Sat, 31 Oct 2020 08:09:13 -0400
Subject: [PATCH 160/228] [partition] Make filesystem optional and default to
 unformatted

---
 src/modules/partition/core/PartitionLayout.cpp | 4 ++--
 src/modules/partition/partition.conf           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 0b0c7bedf..4650449bf 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -134,7 +134,7 @@ PartitionLayout::init( const QVariantList& config )
     {
         QVariantMap pentry = r.toMap();
 
-        if ( !pentry.contains( "name" ) || !pentry.contains( "filesystem" ) || !pentry.contains( "size" ) )
+        if ( !pentry.contains( "name" ) || !pentry.contains( "size" ) )
         {
             cError() << "Partition layout entry #" << config.indexOf( r )
                      << "lacks mandatory attributes, switching to default layout.";
@@ -147,7 +147,7 @@ PartitionLayout::init( const QVariantList& config )
                           CalamaresUtils::getString( pentry, "type" ),
                           CalamaresUtils::getUnsignedInteger( pentry, "attributes", 0 ),
                           CalamaresUtils::getString( pentry, "mountPoint" ),
-                          CalamaresUtils::getString( pentry, "filesystem" ),
+                          CalamaresUtils::getString( pentry, "filesystem", "unformatted" ),
                           CalamaresUtils::getSubMap( pentry, "features", ok ),
                           CalamaresUtils::getString( pentry, "size", QStringLiteral( "0" ) ),
                           CalamaresUtils::getString( pentry, "minSize", QStringLiteral( "0" ) ),
diff --git a/src/modules/partition/partition.conf b/src/modules/partition/partition.conf
index ed2719ca7..e5de69659 100644
--- a/src/modules/partition/partition.conf
+++ b/src/modules/partition/partition.conf
@@ -207,7 +207,7 @@ defaultFileSystemType:  "ext4"
 #   - uuid: partition uuid (optional parameter; gpt only; requires KPMCore >= 4.2.0)
 #   - type: partition type (optional parameter; gpt only; requires KPMCore >= 4.2.0)
 #   - attributes: partition attributes (optional parameter; gpt only; requires KPMCore >= 4.2.0)
-#   - filesystem: filesystem type
+#   - filesystem: filesystem type (optional parameter; fs not created if "unformatted" or unset)
 #   - mountPoint: partition mount point (optional parameter; not mounted if unset)
 #   - size: partition size in bytes (append 'K', 'M' or 'G' for KiB, MiB or GiB)
 #           or

From 6013ed52f8f9efb04365ea8b595d14a0fd2761c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Mon, 2 Nov 2020 08:57:58 -0500
Subject: [PATCH 161/228] [partition] Ignore unformatted filesystem

---
 src/modules/partition/jobs/FillGlobalStorageJob.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
index 8e7958e83..c9040877d 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -153,7 +153,7 @@ FillGlobalStorageJob::prettyDescription() const
             QString path = partitionMap.value( "device" ).toString();
             QString mountPoint = partitionMap.value( "mountPoint" ).toString();
             QString fsType = partitionMap.value( "fs" ).toString();
-            if ( mountPoint.isEmpty() || fsType.isEmpty() )
+            if ( mountPoint.isEmpty() || fsType.isEmpty() || fsType == QString( "unformatted" ) )
             {
                 continue;
             }

From f78752303b4456a0d821680b9748648e3e940c4d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 2 Nov 2020 15:40:32 +0100
Subject: [PATCH 162/228] [partition] Improve constructors for layout

- initialize flags by default
- the copy constructor was just doing the default thing,
  so make that explicit
---
 src/modules/partition/core/PartitionLayout.cpp | 14 --------------
 src/modules/partition/core/PartitionLayout.h   |  4 ++--
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 15b18da93..85ba683d0 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -95,20 +95,6 @@ PartitionLayout::PartitionEntry::PartitionEntry( const QString& label,
     PartUtils::findFS( fs, &partFileSystem );
 }
 
-PartitionLayout::PartitionEntry::PartitionEntry( const PartitionEntry& e )
-    : partLabel( e.partLabel )
-    , partUUID( e.partUUID )
-    , partType( e.partType )
-    , partAttributes( e.partAttributes )
-    , partMountPoint( e.partMountPoint )
-    , partFileSystem( e.partFileSystem )
-    , partFeatures( e.partFeatures )
-    , partSize( e.partSize )
-    , partMinSize( e.partMinSize )
-    , partMaxSize( e.partMaxSize )
-{
-}
-
 
 bool
 PartitionLayout::addEntry( const PartitionEntry& entry )
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index 9720ab765..e54f28b63 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -34,7 +34,7 @@ public:
         QString partLabel;
         QString partUUID;
         QString partType;
-        quint64 partAttributes;
+        quint64 partAttributes = 0;
         QString partMountPoint;
         FileSystem::Type partFileSystem = FileSystem::Unknown;
         QVariantMap partFeatures;
@@ -61,7 +61,7 @@ public:
                         const QString& minSize = QString(),
                         const QString& maxSize = QString() );
         /// @brief Copy PartitionEntry
-        PartitionEntry( const PartitionEntry& e );
+        PartitionEntry( const PartitionEntry& e ) = default;
 
         bool isValid() const
         {

From c85d1ae1fea9b29cfded7adfa90f1cd2a89b428f Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Mon, 2 Nov 2020 17:53:05 +0300
Subject: [PATCH 163/228] Explanation why ICU is needed for usersq module

---
 src/modules/usersq/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/usersq/CMakeLists.txt b/src/modules/usersq/CMakeLists.txt
index 37b4416ad..6ef277395 100644
--- a/src/modules/usersq/CMakeLists.txt
+++ b/src/modules/usersq/CMakeLists.txt
@@ -29,6 +29,7 @@ if( LibPWQuality_FOUND )
     add_definitions( -DCHECK_PWQUALITY -DHAVE_LIBPWQUALITY )
 endif()
 
+#needed for ${_users}/Config.cpp
 find_package( ICU COMPONENTS uc i18n )
 set_package_properties(
     ICU PROPERTIES

From 23eabd74c6b83b0663afb2743b779732690d1baf Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 2 Nov 2020 16:01:10 +0100
Subject: [PATCH 164/228] [partition] Set FS type explicitly if no layout is
 given

- the "simple" constructor for PartitionEntry left the FS type
  set as the constructor left it -- which is Unknown by default.
  This leads to install failures in systems that don't set a
  special layout but just want a single / -- because the FS is
  set to Unknown.
- massage the constructor and consumer of the code, push
  Ext4 FS in the tests and use the configured default in production.
---
 src/modules/partition/core/PartitionLayout.cpp     |  7 ++++---
 src/modules/partition/core/PartitionLayout.h       |  9 +++++++--
 src/modules/partition/tests/CreateLayoutsTests.cpp | 12 ++++++------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 85ba683d0..b71512685 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -63,8 +63,9 @@ PartitionLayout::PartitionEntry::PartitionEntry()
 {
 }
 
-PartitionLayout::PartitionEntry::PartitionEntry( const QString& mountPoint, const QString& size, const QString& minSize, const QString& maxSize )
-    : partAttributes( 0 )
+PartitionLayout::PartitionEntry::PartitionEntry( FileSystem::Type type, const QString& mountPoint, const QString& size, const QString& minSize, const QString& maxSize )
+    : partType( type )
+    , partAttributes( 0 )
     , partMountPoint( mountPoint )
     , partSize( size )
     , partMinSize( minSize )
@@ -148,7 +149,7 @@ PartitionLayout::init( const QVariantList& config )
 
     if ( !m_partLayout.count() )
     {
-        addEntry( { QString( "/" ), QString( "100%" ) } );
+        addEntry( { m_defaultFsType, QString( "/" ), QString( "100%" ) } );
     }
 }
 
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index e54f28b63..8c02a8a41 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -44,8 +44,13 @@ public:
 
         /// @brief All-zeroes PartitionEntry
         PartitionEntry();
-        /// @brief Parse @p mountPoint, @p size, @p minSize and @p maxSize to their respective member variables
-        PartitionEntry( const QString& mountPoint,
+        /** @brief Parse @p mountPoint, @p size, @p minSize and @p maxSize to their respective member variables
+         *
+         * Sets a specific FS type (not parsed from string like the other
+         * constructor).
+         */
+        PartitionEntry( FileSystem::Type type,
+                        const QString& mountPoint,
                         const QString& size,
                         const QString& minSize = QString(),
                         const QString& maxSize = QString() );
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index 4b76bb83a..04a06b2b3 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -59,7 +59,7 @@ CreateLayoutsTests::testFixedSizePartition()
     PartitionRole role( PartitionRole::Role::Any );
     QList< Partition* > partitions;
 
-    if ( !layout.addEntry( { QString( "/" ), QString( "5MiB" ) } ) )
+    if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/" ), QString( "5MiB" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
@@ -79,7 +79,7 @@ CreateLayoutsTests::testPercentSizePartition()
     PartitionRole role( PartitionRole::Role::Any );
     QList< Partition* > partitions;
 
-    if ( !layout.addEntry( { QString( "/" ), QString( "50%" ) } ) )
+    if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/" ), QString( "50%" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
@@ -99,17 +99,17 @@ CreateLayoutsTests::testMixedSizePartition()
     PartitionRole role( PartitionRole::Role::Any );
     QList< Partition* > partitions;
 
-    if ( !layout.addEntry( { QString( "/" ), QString( "5MiB" ) } ) )
+    if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/" ), QString( "5MiB" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
 
-    if ( !layout.addEntry( { QString( "/home" ), QString( "50%" ) } ) )
+    if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/home" ), QString( "50%" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create /home partition" ) );
     }
 
-    if ( !layout.addEntry( { QString( "/bkup" ), QString( "50%" ) } ) )
+    if ( !layout.addEntry( { FileSystem::Type::Ext4, QString( "/bkup" ), QString( "50%" ) } ) )
     {
         QFAIL( qPrintable( "Unable to create /bkup partition" ) );
     }
@@ -124,7 +124,7 @@ CreateLayoutsTests::testMixedSizePartition()
 }
 
 #ifdef WITH_KPMCORE4API
-// TODO: Get a clean way to instanciate a test Device from KPMCore
+// TODO: Get a clean way to instantiate a test Device from KPMCore
 class DevicePrivate
 {
 public:

From 42014a82018d7c70bc209333f26c3f6fb1855222 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 2 Nov 2020 16:21:12 +0100
Subject: [PATCH 165/228] Docs: typo (thanks jdfthetech)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a2cb426b7..d3db39089 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ git clone https://github.com/calamares/calamares.git
 ```
 
 Calamares is a KDE-Frameworks and Qt-based, C++17, CMake-built application.
-The dependencies are explainged in [CONTRIBUTING.md](CONTRIBUTING.md).
+The dependencies are explained in [CONTRIBUTING.md](CONTRIBUTING.md).
 
 ## Contributing to Calamares
 

From 73b5a0898d0102abd469104fbcdab56ce8d7c8fc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 2 Nov 2020 21:35:43 +0100
Subject: [PATCH 166/228] [partition] Migrate the defaultFS type

- remove the m_defaultFSType from PartitionLayout, because it is
  set on construction -- which is too early, before the configuration
  has been read.
- make the default FS explicit in the init() calls which pass in
  a configuration; this needs support in the intermediate
  PartitionCoreModule.
---
 .../partition/core/PartitionCoreModule.cpp    |  7 ++-
 .../partition/core/PartitionCoreModule.h      |  6 +-
 .../partition/core/PartitionLayout.cpp        | 59 ++++++++-----------
 src/modules/partition/core/PartitionLayout.h  |  9 ++-
 .../partition/gui/PartitionViewStep.cpp       |  3 +-
 5 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 706f99017..14ce48b88 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -861,9 +861,9 @@ PartitionCoreModule::setBootLoaderInstallPath( const QString& path )
 }
 
 void
-PartitionCoreModule::initLayout( const QVariantList& config )
+PartitionCoreModule::initLayout( FileSystem::Type defaultFsType, const QVariantList& config )
 {
-    m_partLayout.init( config );
+    m_partLayout.init( defaultFsType, config );
 }
 
 void
@@ -875,7 +875,8 @@ PartitionCoreModule::layoutApply( Device* dev,
                                   const PartitionRole& role )
 {
     bool isEfi = PartUtils::isEfiSystem();
-    QList< Partition* > partList = m_partLayout.createPartitions( dev, firstSector, lastSector, luksPassphrase, parent, role );
+    QList< Partition* > partList
+        = m_partLayout.createPartitions( dev, firstSector, lastSector, luksPassphrase, parent, role );
 
     // Partition::mountPoint() tells us where it is mounted **now**, while
     // PartitionInfo::mountPoint() says where it will be mounted in the target system.
diff --git a/src/modules/partition/core/PartitionCoreModule.h b/src/modules/partition/core/PartitionCoreModule.h
index 46feb5f94..46604b97c 100644
--- a/src/modules/partition/core/PartitionCoreModule.h
+++ b/src/modules/partition/core/PartitionCoreModule.h
@@ -156,7 +156,11 @@ public:
     /// @brief Set the path where the bootloader will be installed
     void setBootLoaderInstallPath( const QString& path );
 
-    void initLayout( const QVariantList& config = QVariantList() );
+    /** @brief Initialize the default layout that will be applied
+     *
+     * See PartitionLayout::init()
+     */
+    void initLayout( FileSystem::Type defaultFsType, const QVariantList& config = QVariantList() );
 
     void layoutApply( Device* dev, qint64 firstSector, qint64 lastSector, QString luksPassphrase );
     void layoutApply( Device* dev,
diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index b71512685..6c5b69b98 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -27,32 +27,10 @@
 #include <kpmcore/core/partition.h>
 #include <kpmcore/fs/filesystem.h>
 
-static FileSystem::Type
-getDefaultFileSystemType()
-{
-    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
-    FileSystem::Type defaultFS = FileSystem::Ext4;
-
-    if ( gs->contains( "defaultFileSystemType" ) )
-    {
-        PartUtils::findFS( gs->value( "defaultFileSystemType" ).toString(), &defaultFS );
-        if ( defaultFS == FileSystem::Unknown )
-        {
-            defaultFS = FileSystem::Ext4;
-        }
-    }
-
-    return defaultFS;
-}
-
-PartitionLayout::PartitionLayout()
-    : m_defaultFsType( getDefaultFileSystemType() )
-{
-}
+PartitionLayout::PartitionLayout() {}
 
 PartitionLayout::PartitionLayout( const PartitionLayout& layout )
-    : m_defaultFsType( layout.m_defaultFsType )
-    , m_partLayout( layout.m_partLayout )
+    : m_partLayout( layout.m_partLayout )
 {
 }
 
@@ -63,7 +41,11 @@ PartitionLayout::PartitionEntry::PartitionEntry()
 {
 }
 
-PartitionLayout::PartitionEntry::PartitionEntry( FileSystem::Type type, const QString& mountPoint, const QString& size, const QString& minSize, const QString& maxSize )
+PartitionLayout::PartitionEntry::PartitionEntry( FileSystem::Type type,
+                                                 const QString& mountPoint,
+                                                 const QString& size,
+                                                 const QString& minSize,
+                                                 const QString& maxSize )
     : partType( type )
     , partAttributes( 0 )
     , partMountPoint( mountPoint )
@@ -111,7 +93,7 @@ PartitionLayout::addEntry( const PartitionEntry& entry )
 }
 
 void
-PartitionLayout::init( const QVariantList& config )
+PartitionLayout::init( FileSystem::Type defaultFsType, const QVariantList& config )
 {
     bool ok;
 
@@ -149,7 +131,7 @@ PartitionLayout::init( const QVariantList& config )
 
     if ( !m_partLayout.count() )
     {
-        addEntry( { m_defaultFsType, QString( "/" ), QString( "100%" ) } );
+        addEntry( { defaultFsType, QString( "/" ), QString( "100%" ) } );
     }
 }
 
@@ -215,8 +197,8 @@ PartitionLayout::createPartitions( Device* dev,
     {
         if ( entry.partSize.unit() == CalamaresUtils::Partition::SizeUnit::Percent )
         {
-            qint64 sectors = entry.partSize.toSectors( availableSectors + partSectorsMap.value( &entry ),
-                                                      dev->logicalSize() );
+            qint64 sectors
+                = entry.partSize.toSectors( availableSectors + partSectorsMap.value( &entry ), dev->logicalSize() );
             if ( entry.partMinSize.isValid() )
             {
                 sectors = std::max( sectors, entry.partMinSize.toSectors( totalSectors, dev->logicalSize() ) );
@@ -245,13 +227,24 @@ PartitionLayout::createPartitions( Device* dev,
         Partition* part = nullptr;
         if ( luksPassphrase.isEmpty() )
         {
-            part = KPMHelpers::createNewPartition(
-                parent, *dev, role, entry.partFileSystem, currentSector, currentSector + sectors - 1, KPM_PARTITION_FLAG( None ) );
+            part = KPMHelpers::createNewPartition( parent,
+                                                   *dev,
+                                                   role,
+                                                   entry.partFileSystem,
+                                                   currentSector,
+                                                   currentSector + sectors - 1,
+                                                   KPM_PARTITION_FLAG( None ) );
         }
         else
         {
-            part = KPMHelpers::createNewEncryptedPartition(
-                parent, *dev, role, entry.partFileSystem, currentSector, currentSector + sectors - 1, luksPassphrase, KPM_PARTITION_FLAG( None ) );
+            part = KPMHelpers::createNewEncryptedPartition( parent,
+                                                            *dev,
+                                                            role,
+                                                            entry.partFileSystem,
+                                                            currentSector,
+                                                            currentSector + sectors - 1,
+                                                            luksPassphrase,
+                                                            KPM_PARTITION_FLAG( None ) );
         }
         PartitionInfo::setFormat( part, true );
         PartitionInfo::setMountPoint( part, entry.partMountPoint );
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index 8c02a8a41..24858aef8 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -83,7 +83,13 @@ public:
     PartitionLayout( const PartitionLayout& layout );
     ~PartitionLayout();
 
-    void init( const QVariantList& config );
+    /** @brief create the configuration from @p config
+     *
+     * @p config is a list of partition entries (in QVariant form,
+     * read from YAML). If no entries are given, then a single
+     * partition is created with the given @p defaultFsType
+     */
+    void init( FileSystem::Type defaultFsType, const QVariantList& config );
     bool addEntry( const PartitionEntry& entry );
 
     /**
@@ -98,7 +104,6 @@ public:
                                           const PartitionRole& role );
 
 private:
-    FileSystem::Type m_defaultFsType;
     QList< PartitionEntry > m_partLayout;
 };
 
diff --git a/src/modules/partition/gui/PartitionViewStep.cpp b/src/modules/partition/gui/PartitionViewStep.cpp
index 13f5e77cc..561fdaba7 100644
--- a/src/modules/partition/gui/PartitionViewStep.cpp
+++ b/src/modules/partition/gui/PartitionViewStep.cpp
@@ -602,7 +602,8 @@ PartitionViewStep::setConfigurationMap( const QVariantMap& configurationMap )
     QFuture< void > future = QtConcurrent::run( this, &PartitionViewStep::initPartitionCoreModule );
     m_future->setFuture( future );
 
-    m_core->initLayout( configurationMap.value( "partitionLayout" ).toList() );
+    m_core->initLayout( fsType == FileSystem::Unknown ? FileSystem::Ext4 : fsType,
+                        configurationMap.value( "partitionLayout" ).toList() );
 }
 
 

From ffce79e30ea44f10e9a876c73c2f715a394511b5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 2 Nov 2020 22:32:44 +0100
Subject: [PATCH 167/228] [partition] Initialize the filesystem type, not the
 partition type

- Passing FileSystem::Type to the QString constructor for
  partition type is not what I intended.
---
 src/modules/partition/core/PartitionLayout.cpp | 6 +++---
 src/modules/partition/core/PartitionLayout.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/partition/core/PartitionLayout.cpp b/src/modules/partition/core/PartitionLayout.cpp
index 6c5b69b98..b460d8bb4 100644
--- a/src/modules/partition/core/PartitionLayout.cpp
+++ b/src/modules/partition/core/PartitionLayout.cpp
@@ -41,14 +41,14 @@ PartitionLayout::PartitionEntry::PartitionEntry()
 {
 }
 
-PartitionLayout::PartitionEntry::PartitionEntry( FileSystem::Type type,
+PartitionLayout::PartitionEntry::PartitionEntry( FileSystem::Type fs,
                                                  const QString& mountPoint,
                                                  const QString& size,
                                                  const QString& minSize,
                                                  const QString& maxSize )
-    : partType( type )
-    , partAttributes( 0 )
+    : partAttributes( 0 )
     , partMountPoint( mountPoint )
+    , partFileSystem( fs )
     , partSize( size )
     , partMinSize( minSize )
     , partMaxSize( maxSize )
diff --git a/src/modules/partition/core/PartitionLayout.h b/src/modules/partition/core/PartitionLayout.h
index 24858aef8..6e0c73f8f 100644
--- a/src/modules/partition/core/PartitionLayout.h
+++ b/src/modules/partition/core/PartitionLayout.h
@@ -49,7 +49,7 @@ public:
          * Sets a specific FS type (not parsed from string like the other
          * constructor).
          */
-        PartitionEntry( FileSystem::Type type,
+        PartitionEntry( FileSystem::Type fs,
                         const QString& mountPoint,
                         const QString& size,
                         const QString& minSize = QString(),

From 8ab5b562adc83370736cceb7c94722e564056ff4 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 3 Nov 2020 11:16:45 +0100
Subject: [PATCH 168/228] i18n: timezone translations for Vietnamese

---
 lang/tz_vi.ts | 2617 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 2617 insertions(+)
 create mode 100644 lang/tz_vi.ts

diff --git a/lang/tz_vi.ts b/lang/tz_vi.ts
new file mode 100644
index 000000000..b7149efa9
--- /dev/null
+++ b/lang/tz_vi.ts
@@ -0,0 +1,2617 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="vi">
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="30"/>
+        <source>Africa</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Châu phi</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="31"/>
+        <source>America</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Châu Mỹ</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="32"/>
+        <source>Antarctica</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Nam Cực</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="33"/>
+        <source>Arctic</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Bắc cực</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="34"/>
+        <source>Asia</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Châu Á</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="35"/>
+        <source>Atlantic</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Đại Tây Dương</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="36"/>
+        <source>Australia</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Châu Úc</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="37"/>
+        <source>Europe</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Châu Âu</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="38"/>
+        <source>Indian</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Ấn Độ</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="39"/>
+        <source>Pacific</source>
+        <comment>tz_regions</comment>
+        <translation type="unfinished">Thái Bình Dương</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="50"/>
+        <source>Abidjan</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Abidjan</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="51"/>
+        <source>Accra</source>
+        <comment>tz_names</comment>
+        <translation>Accra</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="52"/>
+        <source>Adak</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Adak</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="53"/>
+        <source>Addis Ababa</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">A-đi A-ba-ba</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="54"/>
+        <source>Adelaide</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Adelaide</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="55"/>
+        <source>Aden</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Aden</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="56"/>
+        <source>Algiers</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Algiers</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="57"/>
+        <source>Almaty</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Almaty</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="58"/>
+        <source>Amman</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Amman</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="59"/>
+        <source>Amsterdam</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Am-xtéc-đam</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="60"/>
+        <source>Anadyr</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Anadyr</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="61"/>
+        <source>Anchorage</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Anchorage</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="62"/>
+        <source>Andorra</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Andorra</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="63"/>
+        <source>Anguilla</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">An-gui-la</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="64"/>
+        <source>Antananarivo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">An-ta-na-na-ri-vô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="65"/>
+        <source>Antigua</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Antigua</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="66"/>
+        <source>Apia</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">A-pi-a</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="67"/>
+        <source>Aqtau</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Aqtau</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="68"/>
+        <source>Aqtobe</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Aqtobe</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="69"/>
+        <source>Araguaina</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Araguaina</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="70"/>
+        <source>Argentina/Buenos Aires</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/Buenos Aires</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="71"/>
+        <source>Argentina/Catamarca</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/Catamarca</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="72"/>
+        <source>Argentina/Cordoba</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/Cordoba</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="73"/>
+        <source>Argentina/Jujuy</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/Jujuy</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="74"/>
+        <source>Argentina/La Rioja</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/La Rioja</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="75"/>
+        <source>Argentina/Mendoza</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/Mendoza</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="76"/>
+        <source>Argentina/Rio Gallegos</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/Rio Gallegos</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="77"/>
+        <source>Argentina/Salta</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/Salta</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="78"/>
+        <source>Argentina/San Juan</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/San Juan</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="79"/>
+        <source>Argentina/San Luis</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/San Luis</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="80"/>
+        <source>Argentina/Tucuman</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/Tucuman</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="81"/>
+        <source>Argentina/Ushuaia</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ác-hen-ti-na/Ushuaia</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="82"/>
+        <source>Aruba</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">A-ru-ba</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="83"/>
+        <source>Ashgabat</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">A-sơ-kha0bast</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="84"/>
+        <source>Asmara</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Át-ma-ra</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="85"/>
+        <source>Astrakhan</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Astrakhan</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="86"/>
+        <source>Asuncion</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">A-sun-sân</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="87"/>
+        <source>Athens</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">A-ten</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="88"/>
+        <source>Atikokan</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Atikokan</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="89"/>
+        <source>Atyrau</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Atyrau</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="90"/>
+        <source>Auckland</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Auckland</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="91"/>
+        <source>Azores</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Azores</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="92"/>
+        <source>Baghdad</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bát-đa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="93"/>
+        <source>Bahia</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bahia</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="94"/>
+        <source>Bahia Banderas</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bahia Banderas</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="95"/>
+        <source>Bahrain</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ba-ranh</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="96"/>
+        <source>Baku</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ba-cu</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="97"/>
+        <source>Bamako</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bamako</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="98"/>
+        <source>Bangkok</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Băng Cốc</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="99"/>
+        <source>Bangui</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ban-gui</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="100"/>
+        <source>Banjul</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ban-giun</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="101"/>
+        <source>Barbados</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bác-ba-đốt</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="102"/>
+        <source>Barnaul</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Barnaul</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="103"/>
+        <source>Beirut</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bê-rút</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="104"/>
+        <source>Belem</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Belem</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="105"/>
+        <source>Belgrade</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bê-ô-grát</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="106"/>
+        <source>Belize</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bê-li-xê</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="107"/>
+        <source>Berlin</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Béc Lin</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="108"/>
+        <source>Bermuda</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Béc-mu-đa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="109"/>
+        <source>Bishkek</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bi-skec</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="110"/>
+        <source>Bissau</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bit-xao</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="111"/>
+        <source>Blanc-Sablon</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Blanc-Sablon</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="112"/>
+        <source>Blantyre</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Blantyre</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="113"/>
+        <source>Boa Vista</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Boa Vista</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="114"/>
+        <source>Bogota</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bô-gô-ta</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="115"/>
+        <source>Boise</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Boise</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="116"/>
+        <source>Bougainville</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bougainville</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="117"/>
+        <source>Bratislava</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bra-tít-xla-va</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="118"/>
+        <source>Brazzaville</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Brazzaville</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="119"/>
+        <source>Brisbane</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Brisbane</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="120"/>
+        <source>Broken Hill</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đồi Broken</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="121"/>
+        <source>Brunei</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bru-nây</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="122"/>
+        <source>Brussels</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Brúc-xen</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="123"/>
+        <source>Bucharest</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bu-ca-rét</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="124"/>
+        <source>Budapest</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bu-đa-pét</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="125"/>
+        <source>Bujumbura</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bu-gium-bu-ra</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="126"/>
+        <source>Busingen</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Busingen</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="127"/>
+        <source>Cairo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cai Rô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="128"/>
+        <source>Cambridge Bay</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Vịnh Cambridge</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="129"/>
+        <source>Campo Grande</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Campo Grande</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="130"/>
+        <source>Canary</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Canary</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="131"/>
+        <source>Cancun</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cancun</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="132"/>
+        <source>Cape Verde</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cáp-ve</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="133"/>
+        <source>Caracas</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ca-ra-cát</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="134"/>
+        <source>Casablanca</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Casablanca</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="135"/>
+        <source>Casey</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Casey</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="136"/>
+        <source>Cayenne</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cayenne</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="137"/>
+        <source>Cayman</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Quần đảo Cay-man</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="138"/>
+        <source>Ceuta</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ceuta</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="139"/>
+        <source>Chagos</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Chagos</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="140"/>
+        <source>Chatham</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Chatham</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="141"/>
+        <source>Chicago</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Chi Ca Gô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="142"/>
+        <source>Chihuahua</source>
+        <comment>tz_names</comment>
+        <translation>Chihuahua</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="143"/>
+        <source>Chisinau</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ki-si-nhốp</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="144"/>
+        <source>Chita</source>
+        <comment>tz_names</comment>
+        <translation>Chita</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="145"/>
+        <source>Choibalsan</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Choibalsan</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="146"/>
+        <source>Christmas</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Christmas</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="147"/>
+        <source>Chuuk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Chuuk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="148"/>
+        <source>Cocos</source>
+        <comment>tz_names</comment>
+        <translation>Cocos</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="149"/>
+        <source>Colombo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cô Lôm Bô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="150"/>
+        <source>Comoro</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">(Liên bang) Cô-mo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="151"/>
+        <source>Conakry</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cô-na-cri</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="152"/>
+        <source>Copenhagen</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cô-pen-ha-gen</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="153"/>
+        <source>Costa Rica</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cốt-xta-ri-ca</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="154"/>
+        <source>Creston</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Creston</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="155"/>
+        <source>Cuiaba</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cuiaba</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="156"/>
+        <source>Curacao</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cu-ra-xao</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="157"/>
+        <source>Currie</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Currie</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="158"/>
+        <source>Dakar</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Dakar</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="159"/>
+        <source>Damascus</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đa-mát</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="160"/>
+        <source>Danmarkshavn</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Danmarkshavn</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="161"/>
+        <source>Dar es Salaam</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Dar es Salaam</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="162"/>
+        <source>Darwin</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Darwin</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="163"/>
+        <source>Davis</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Davis</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="164"/>
+        <source>Dawson</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Dawson</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="165"/>
+        <source>Dawson Creek</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Dawson Creek</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="166"/>
+        <source>Denver</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Denver</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="167"/>
+        <source>Detroit</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Detroit</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="168"/>
+        <source>Dhaka</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đắc-ca</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="169"/>
+        <source>Dili</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đi-li</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="170"/>
+        <source>Djibouti</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cộng hòa Gi-bu-ti</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="171"/>
+        <source>Dominica</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đô-mi-ni-ca-na</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="172"/>
+        <source>Douala</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Douala</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="173"/>
+        <source>Dubai</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đu Bai</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="174"/>
+        <source>Dublin</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đu-blin</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="175"/>
+        <source>DumontDUrville</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">DumontDUrville</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="176"/>
+        <source>Dushanbe</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đu-san-be</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="177"/>
+        <source>Easter</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đảo Phục Sinh</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="178"/>
+        <source>Edmonton</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Edmonton</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="179"/>
+        <source>Efate</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Efate</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="180"/>
+        <source>Eirunepe</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Eirunepe</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="181"/>
+        <source>El Aaiun</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">El Aaiun</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="182"/>
+        <source>El Salvador</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">En Xan-va-đo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="183"/>
+        <source>Enderbury</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đảo Enderbury</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="184"/>
+        <source>Eucla</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Eucla</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="185"/>
+        <source>Fakaofo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Fakaofo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="186"/>
+        <source>Famagusta</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Famagusta</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="187"/>
+        <source>Faroe</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Quần đảo Fa-rô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="188"/>
+        <source>Fiji</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Phi-gi</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="189"/>
+        <source>Fort Nelson</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Fort Nelson</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="190"/>
+        <source>Fortaleza</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Fortaleza</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="191"/>
+        <source>Freetown</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Phritao</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="192"/>
+        <source>Funafuti</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Funafuti</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="193"/>
+        <source>Gaborone</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ga-bô-rô-nê</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="194"/>
+        <source>Galapagos</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Quần đảo Galapagos</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="195"/>
+        <source>Gambier</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Gambier</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="196"/>
+        <source>Gaza</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Dải Gaza</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="197"/>
+        <source>Gibraltar</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Gibraltar</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="198"/>
+        <source>Glace Bay</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Vịnh Glace</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="199"/>
+        <source>Godthab</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Nu-úc</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="200"/>
+        <source>Goose Bay</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Vịnh Goose</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="201"/>
+        <source>Grand Turk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đảo Grand Turk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="202"/>
+        <source>Grenada</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Grê-na-đa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="203"/>
+        <source>Guadalcanal</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Guadalcanal</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="204"/>
+        <source>Guadeloupe</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Goa-đê-lốp</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="205"/>
+        <source>Guam</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Guam</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="206"/>
+        <source>Guatemala</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Goa-tê-ma-la</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="207"/>
+        <source>Guayaquil</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Guayaquil</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="208"/>
+        <source>Guernsey</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Guernsey</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="209"/>
+        <source>Guyana</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Guy-a-na</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="210"/>
+        <source>Halifax</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Halifa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="211"/>
+        <source>Harare</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ha-ra-rê</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="212"/>
+        <source>Havana</source>
+        <comment>tz_names</comment>
+        <translation>Ha Va Na</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="213"/>
+        <source>Hebron</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Hebron</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="214"/>
+        <source>Helsinki</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Hen-sin-ki</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="215"/>
+        <source>Hermosillo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Hermosillo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="216"/>
+        <source>Ho Chi Minh</source>
+        <comment>tz_names</comment>
+        <translation>Hồ Chí Minh</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="217"/>
+        <source>Hobart</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Hobart</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="218"/>
+        <source>Hong Kong</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Hồng Công</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="219"/>
+        <source>Honolulu</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Honolulu</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="220"/>
+        <source>Hovd</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Khovd</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="221"/>
+        <source>Indiana/Indianapolis</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Indiana/Indianapolis</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="222"/>
+        <source>Indiana/Knox</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Indiana/Knox</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="223"/>
+        <source>Indiana/Marengo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Indiana/Marengo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="224"/>
+        <source>Indiana/Petersburg</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Indiana/Petersburg</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="225"/>
+        <source>Indiana/Tell City</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Indiana/Tell City</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="226"/>
+        <source>Indiana/Vevay</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Indiana/Vevay</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="227"/>
+        <source>Indiana/Vincennes</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Indiana/Vincennes</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="228"/>
+        <source>Indiana/Winamac</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Indiana/Winamac</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="229"/>
+        <source>Inuvik</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Inuvik</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="230"/>
+        <source>Iqaluit</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Iqaluit</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="231"/>
+        <source>Irkutsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Irkutsk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="232"/>
+        <source>Isle of Man</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đảo Man</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="233"/>
+        <source>Istanbul</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Istanbul</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="234"/>
+        <source>Jakarta</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Gia Các Ta</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="235"/>
+        <source>Jamaica</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Gia-mai-ca</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="236"/>
+        <source>Jayapura</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Jayapura</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="237"/>
+        <source>Jersey</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Jersey</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="238"/>
+        <source>Jerusalem</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Giê-ru-xa-lem</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="239"/>
+        <source>Johannesburg</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Johannesburg</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="240"/>
+        <source>Juba</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Juba</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="241"/>
+        <source>Juneau</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Juneau</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="242"/>
+        <source>Kabul</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ka-bun</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="243"/>
+        <source>Kaliningrad</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kaliningrad</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="244"/>
+        <source>Kamchatka</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bán đảo Kamchatka</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="245"/>
+        <source>Kampala</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Campala</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="246"/>
+        <source>Karachi</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Karachi</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="247"/>
+        <source>Kathmandu</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cát-man-đu</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="248"/>
+        <source>Kentucky/Louisville</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ken túc ky/Louisville</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="249"/>
+        <source>Kentucky/Monticello</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ken túc ky/Monticello</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="250"/>
+        <source>Kerguelen</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đảo Kerguelen</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="251"/>
+        <source>Khandyga</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Khandyga</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="252"/>
+        <source>Khartoum</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Khác-tum</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="253"/>
+        <source>Kiev</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kyiv</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="254"/>
+        <source>Kigali</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ki-ga-li</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="255"/>
+        <source>Kinshasa</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kin-xa-sa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="256"/>
+        <source>Kiritimati</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kiritimati</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="257"/>
+        <source>Kirov</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kirov</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="258"/>
+        <source>Kolkata</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kolkata</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="259"/>
+        <source>Kosrae</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kosrae</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="260"/>
+        <source>Kralendijk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kralendijk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="261"/>
+        <source>Krasnoyarsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Krasnoyarsk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="262"/>
+        <source>Kuala Lumpur</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kuala Lam Pơ</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="263"/>
+        <source>Kuching</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kuching</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="264"/>
+        <source>Kuwait</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kuwait</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="265"/>
+        <source>Kwajalein</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kwajalein</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="266"/>
+        <source>La Paz</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">La Pa-xơ</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="267"/>
+        <source>Lagos</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lagos</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="268"/>
+        <source>Libreville</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Li-brơ-vin</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="269"/>
+        <source>Lima</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lima</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="270"/>
+        <source>Lindeman</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Hồ Lindeman</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="271"/>
+        <source>Lisbon</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lít Bon</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="272"/>
+        <source>Ljubljana</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Liu-bli-an-na</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="273"/>
+        <source>Lome</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lô-mê</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="274"/>
+        <source>London</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Luân Đôn</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="275"/>
+        <source>Longyearbyen</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Longyearbyen</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="276"/>
+        <source>Lord Howe</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đảo Lord Howe</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="277"/>
+        <source>Los Angeles</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lốt Ăng Giơ Lét</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="278"/>
+        <source>Lower Princes</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lower Princes</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="279"/>
+        <source>Luanda</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lu-an-đa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="280"/>
+        <source>Lubumbashi</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lubumbashi</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="281"/>
+        <source>Lusaka</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lu-xa-ca</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="282"/>
+        <source>Luxembourg</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Lúc-xăm-bua</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="283"/>
+        <source>Macau</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ma Cao</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="284"/>
+        <source>Maceio</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Maceio</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="285"/>
+        <source>Macquarie</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Macquarie</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="286"/>
+        <source>Madeira</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Madeira</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="287"/>
+        <source>Madrid</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ma Rích</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="288"/>
+        <source>Magadan</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Magadan</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="289"/>
+        <source>Mahe</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mahe</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="290"/>
+        <source>Majuro</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Majuro</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="291"/>
+        <source>Makassar</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Makassar</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="292"/>
+        <source>Malabo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Malabo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="293"/>
+        <source>Maldives</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Man-đi-vơ</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="294"/>
+        <source>Malta</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Man-Man-tata</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="295"/>
+        <source>Managua</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ma-na-goa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="296"/>
+        <source>Manaus</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Manaus</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="297"/>
+        <source>Manila</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Manila</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="298"/>
+        <source>Maputo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Maputo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="299"/>
+        <source>Mariehamn</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mariehamn</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="300"/>
+        <source>Marigot</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Marigot</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="301"/>
+        <source>Marquesas</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Quần đảo Marquesas</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="302"/>
+        <source>Martinique</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Martinique</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="303"/>
+        <source>Maseru</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ma-xê-ru</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="304"/>
+        <source>Matamoros</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Matamoros</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="305"/>
+        <source>Mauritius</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mô-ri-xơ</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="306"/>
+        <source>Mawson</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mawson</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="307"/>
+        <source>Mayotte</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mayotte</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="308"/>
+        <source>Mazatlan</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mazatlan</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="309"/>
+        <source>Mbabane</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mbabane</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="310"/>
+        <source>McMurdo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">McMurdo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="311"/>
+        <source>Melbourne</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Melbourne</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="312"/>
+        <source>Menominee</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Menominee</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="313"/>
+        <source>Merida</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Merida</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="314"/>
+        <source>Metlakatla</source>
+        <comment>tz_names</comment>
+        <translation>Metlakatla</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="315"/>
+        <source>Mexico City</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Thành phố Mê Xi Cô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="316"/>
+        <source>Midway</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Midway</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="317"/>
+        <source>Minsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Min-xcơ</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="318"/>
+        <source>Miquelon</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mi-kê-lân</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="319"/>
+        <source>Mogadishu</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mô-ga-đi-su</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="320"/>
+        <source>Monaco</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mô-na-cô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="321"/>
+        <source>Moncton</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Moncton</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="322"/>
+        <source>Monrovia</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Monrovia</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="323"/>
+        <source>Monterrey</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Monterrey</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="324"/>
+        <source>Montevideo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mông-tơ-vi-di-ô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="325"/>
+        <source>Montserrat</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Montserrat</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="326"/>
+        <source>Moscow</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mát Cơ Va</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="327"/>
+        <source>Muscat</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Mu Cát</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="328"/>
+        <source>Nairobi</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Nai-rô-bi</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="329"/>
+        <source>Nassau</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Nát-xô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="330"/>
+        <source>Nauru</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Na-u-ru</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="331"/>
+        <source>Ndjamena</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Gia-mê-na</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="332"/>
+        <source>New York</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Nữu Ước</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="333"/>
+        <source>Niamey</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ni-a-mây</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="334"/>
+        <source>Nicosia</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ni-cô-xi-a</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="335"/>
+        <source>Nipigon</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Nipigon</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="336"/>
+        <source>Niue</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ni-u-ê</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="337"/>
+        <source>Nome</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Nome</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="338"/>
+        <source>Norfolk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Norfolk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="339"/>
+        <source>Noronha</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Noronha</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="340"/>
+        <source>North Dakota/Beulah</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bắc Dakota/Beulah</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="341"/>
+        <source>North Dakota/Center</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bắc Dakota/Center</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="342"/>
+        <source>North Dakota/New Salem</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bắc Dakota/New Salem</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="343"/>
+        <source>Nouakchott</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Nu-ác-sốt</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="344"/>
+        <source>Noumea</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">No-mi</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="345"/>
+        <source>Novokuznetsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Novokuznetsk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="346"/>
+        <source>Novosibirsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Novosibirsk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="347"/>
+        <source>Ojinaga</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ojinaga</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="348"/>
+        <source>Omsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Omsk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="349"/>
+        <source>Oral</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Oral</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="350"/>
+        <source>Oslo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ốt-xlô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="351"/>
+        <source>Ouagadougou</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">U-a-ga-đu-gu</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="352"/>
+        <source>Pago Pago</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Pago Pago</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="353"/>
+        <source>Palau</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Pa-lau</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="354"/>
+        <source>Palmer</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Palmer</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="355"/>
+        <source>Panama</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Pa-na-ma</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="356"/>
+        <source>Pangnirtung</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Pangnirtung</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="357"/>
+        <source>Paramaribo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Pa-ra-ma-ri-bô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="358"/>
+        <source>Paris</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Pa Ri</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="359"/>
+        <source>Perth</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Perth</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="360"/>
+        <source>Phnom Penh</source>
+        <comment>tz_names</comment>
+        <translation>Phnôm Pênh</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="361"/>
+        <source>Phoenix</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Phoenix</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="362"/>
+        <source>Pitcairn</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Quần đảo Pít-cơn</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="363"/>
+        <source>Podgorica</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Pốt-gô-ri-xa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="364"/>
+        <source>Pohnpei</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Pohnpei</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="365"/>
+        <source>Pontianak</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Pontianak</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="366"/>
+        <source>Port Moresby</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cảng Moresby</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="367"/>
+        <source>Port of Spain</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cảng Tây Ban Nha</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="368"/>
+        <source>Port-au-Prince</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cảng au Prince</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="369"/>
+        <source>Porto Velho</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cảng Velho</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="370"/>
+        <source>Porto-Novo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cảng-Novo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="371"/>
+        <source>Prague</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Praha</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="372"/>
+        <source>Puerto Rico</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Cảng Rico</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="373"/>
+        <source>Punta Arenas</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Đấu trường Punta</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="374"/>
+        <source>Pyongyang</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Bình Nhưỡng</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="375"/>
+        <source>Qatar</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ca-ta</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="376"/>
+        <source>Qostanay</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kostanay</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="377"/>
+        <source>Qyzylorda</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Kyzylorda</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="378"/>
+        <source>Rainy River</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Rainy River</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="379"/>
+        <source>Rankin Inlet</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Rankin Inlet</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="380"/>
+        <source>Rarotonga</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Rarotonga</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="381"/>
+        <source>Recife</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Recife</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="382"/>
+        <source>Regina</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Regina</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="383"/>
+        <source>Resolute</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Resolute</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="384"/>
+        <source>Reunion</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Rê-u-niên</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="385"/>
+        <source>Reykjavik</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Rây-ki-a-vích</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="386"/>
+        <source>Riga</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ri-ga</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="387"/>
+        <source>Rio Branco</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Rio Branco</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="388"/>
+        <source>Riyadh</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ri-át</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="389"/>
+        <source>Rome</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Rô Ma</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="390"/>
+        <source>Rothera</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Rothera</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="391"/>
+        <source>Saipan</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Saipan</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="392"/>
+        <source>Sakhalin</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Sakhalin</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="393"/>
+        <source>Samara</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Samara</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="394"/>
+        <source>Samarkand</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Samarkand</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="395"/>
+        <source>San Marino</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">San Marino</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="396"/>
+        <source>Santarem</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Santarem</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="397"/>
+        <source>Santiago</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Santiago</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="398"/>
+        <source>Santo Domingo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Xan-tô Đô-min-gô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="399"/>
+        <source>Sao Paulo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Sao Paolo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="400"/>
+        <source>Sao Tome</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Sao Tô-mê</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="401"/>
+        <source>Sarajevo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Xa-ra-ê-vô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="402"/>
+        <source>Saratov</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Saratov</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="403"/>
+        <source>Scoresbysund</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Scoresby Sund</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="404"/>
+        <source>Seoul</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Xê un</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="405"/>
+        <source>Shanghai</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Thượng Hải</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="406"/>
+        <source>Simferopol</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Simferopol</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="407"/>
+        <source>Singapore</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Singapo</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="408"/>
+        <source>Sitka</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Sitka</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="409"/>
+        <source>Skopje</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Xcốp-pi-ê</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="410"/>
+        <source>Sofia</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Sofia</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="411"/>
+        <source>South Georgia</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Nam Georgia</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="412"/>
+        <source>Srednekolymsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Srednekolymsk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="413"/>
+        <source>St Barthelemy</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">St Barthelemy</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="414"/>
+        <source>St Helena</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">St Helena</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="415"/>
+        <source>St Johns</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">St Johns</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="416"/>
+        <source>St Kitts</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">St Kitts</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="417"/>
+        <source>St Lucia</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">St Lucia</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="418"/>
+        <source>St Thomas</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">St Thomas</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="419"/>
+        <source>St Vincent</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">St Vincent</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="420"/>
+        <source>Stanley</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Stanley</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="421"/>
+        <source>Stockholm</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Xtốc-khôm</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="422"/>
+        <source>Swift Current</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Swift Current</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="423"/>
+        <source>Sydney</source>
+        <comment>tz_names</comment>
+        <translation>Xít ni</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="424"/>
+        <source>Syowa</source>
+        <comment>tz_names</comment>
+        <translation>Syowa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="425"/>
+        <source>Tahiti</source>
+        <comment>tz_names</comment>
+        <translation>Tahiti</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="426"/>
+        <source>Taipei</source>
+        <comment>tz_names</comment>
+        <translation>Đài Bắc</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="427"/>
+        <source>Tallinn</source>
+        <comment>tz_names</comment>
+        <translation>Ta-lin</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="428"/>
+        <source>Tarawa</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tarawa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="429"/>
+        <source>Tashkent</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ta-sơ-ken</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="430"/>
+        <source>Tbilisi</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tbi-li-xi</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="431"/>
+        <source>Tegucigalpa</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Te-gu-xi-gan-pa</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="432"/>
+        <source>Tehran</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tê-hê-ran</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="433"/>
+        <source>Thimphu</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Thim-bu</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="434"/>
+        <source>Thule</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Thule</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="435"/>
+        <source>Thunder Bay</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Vịnh Thunder</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="436"/>
+        <source>Tijuana</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tijuana</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="437"/>
+        <source>Tirane</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ti-ra-na</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="438"/>
+        <source>Tokyo</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tô Ky Ôs</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="439"/>
+        <source>Tomsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tomsk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="440"/>
+        <source>Tongatapu</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tongatapu</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="441"/>
+        <source>Toronto</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tô Rôn Tô</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="442"/>
+        <source>Tortola</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tortola</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="443"/>
+        <source>Tripoli</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tri Pô Li</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="444"/>
+        <source>Troll</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Troll</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="445"/>
+        <source>Tunis</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Tuy-nít</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="446"/>
+        <source>Ulaanbaatar</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ulan Bato</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="447"/>
+        <source>Ulyanovsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ulyanovsk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="448"/>
+        <source>Urumqi</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Urumqi</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="449"/>
+        <source>Ust-Nera</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ust-Nera</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="450"/>
+        <source>Uzhgorod</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Uzhgorod</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="451"/>
+        <source>Vaduz</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Vaduz</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="452"/>
+        <source>Vancouver</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Van Cô Vơ</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="453"/>
+        <source>Vatican</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Va Ti Can</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="454"/>
+        <source>Vienna</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Viên</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="455"/>
+        <source>Vientiane</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Viêng Chăn</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="456"/>
+        <source>Vilnius</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Vin-ni-út</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="457"/>
+        <source>Vladivostok</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Vladivostok</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="458"/>
+        <source>Volgograd</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Volgograd</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="459"/>
+        <source>Vostok</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Vostok</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="460"/>
+        <source>Wake</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Wake</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="461"/>
+        <source>Wallis</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Wa Li</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="462"/>
+        <source>Warsaw</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Vác-sa-va</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="463"/>
+        <source>Whitehorse</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Whitehorse</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="464"/>
+        <source>Windhoek</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Windhoek</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="465"/>
+        <source>Winnipeg</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Winnipeg</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="466"/>
+        <source>Yakutat</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Yakutat</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="467"/>
+        <source>Yakutsk</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Yakutsk</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="468"/>
+        <source>Yangon</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ragoon</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="469"/>
+        <source>Yekaterinburg</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Yekaterinburg</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="470"/>
+        <source>Yellowknife</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Yellowknife</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="471"/>
+        <source>Yerevan</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Ê-rê-van</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="472"/>
+        <source>Zagreb</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Da-gờ-rép</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="473"/>
+        <source>Zaporozhye</source>
+        <comment>tz_names</comment>
+        <translation>Zaporizhia</translation>
+    </message>
+    <message>
+        <location filename="../src/libcalamares/locale/ZoneData_p.cxxtr" line="474"/>
+        <source>Zurich</source>
+        <comment>tz_names</comment>
+        <translation type="unfinished">Zurich</translation>
+    </message>
+</context>
+</TS>

From ed95c4a5413a76c6e1086d33a4bc45755b910e0b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 3 Nov 2020 11:52:23 +0100
Subject: [PATCH 169/228] CMake: pre-release housekeeping

---
 CHANGES        | 7 ++++++-
 CMakeLists.txt | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 85accf44d..27abd9eef 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.33 (unreleased) #
+# 3.2.33 (2020-11-03) #
 
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma
@@ -28,6 +28,11 @@ This release contains contributions from (alphabetically by first name):
    and usernames). (Thanks Artem)
  - Various cleanups and documentation improvements in the *partition*
    module, and configurable GPT name for swap. (Thanks Gaël)
+ - The *users* module now has a more detailed way to specify
+   user groups -- which may be system groups rather than user-GIDs.
+   A new option in each group can require that the group already
+   exists in the target system, allowing for better consistency checks
+   with the squashfs.
 
 
 # 3.2.32.1 (2020-10-17) #
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b20ce50d9..d8744afb4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ project( CALAMARES
     VERSION 3.2.33
     LANGUAGES C CXX )
 
-set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From 7c268b2e4d5458ba5705fecd9d6395823cd92606 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 3 Nov 2020 12:48:12 +0100
Subject: [PATCH 170/228] [users] Correct terminology in configuration
 documentation

---
 src/modules/users/users.conf | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf
index ee1ccbf1c..8606fd224 100644
--- a/src/modules/users/users.conf
+++ b/src/modules/users/users.conf
@@ -3,16 +3,16 @@
 #
 # Configuration for the one-user-system user module.
 #
-# Besides these settings, the user module also places the following
-# keys into the globalconfig area, based on user input in the view step.
+# Besides these settings, the users module also places the following
+# keys into the Global Storage area, based on user input in the view step.
 #
 # - hostname
 # - username
 # - password (obscured)
 # - autologinUser (if enabled, set to username)
 #
-# These globalconfig keys are set when the jobs for this module
-# are created.
+# These Global Storage keys are set when the configuration for this module
+# is read and when they are modified in the UI.
 ---
 # Used as default groups for the created user.
 # Adjust to your Distribution defaults.

From 36f9fd56a3e6263b726a4b4d013aadfbb6a66400 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 3 Nov 2020 12:54:19 +0100
Subject: [PATCH 171/228] [users] Expand the example config with new
 possibilities

---
 src/modules/users/users.conf | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/modules/users/users.conf b/src/modules/users/users.conf
index 8606fd224..2e09ae123 100644
--- a/src/modules/users/users.conf
+++ b/src/modules/users/users.conf
@@ -16,13 +16,29 @@
 ---
 # Used as default groups for the created user.
 # Adjust to your Distribution defaults.
+#
+# Each entry in the *defaultGroups* list is either:
+#   - a string, naming a group; this is a **non**-system group
+#     which does not need to exist in the target system; if it
+#     does not exist, it will be created.
+#   - an entry with subkeys *name*, *must_exist* and *system*;
+#     if the group *must_exist* and does not, an error is thrown
+#     and the installation fails.
+#
+#     The group is created if it does not exist, and it is
+#     created as a system group (GID < 1000) or user group
+#     (GID >= 1000) depending on the value of *system*.
 defaultGroups:
-    - users
+    - name: users
+      must_exist: true
+      system: true
     - lp
     - video
     - network
     - storage
-    - wheel
+    - name: wheel
+      must_exist: false
+      system: true
     - audio
 
 # Some Distributions require a 'autologin' group for the user.

From 3bf57c7785a5efd6c43d50b97212c6a995598953 Mon Sep 17 00:00:00 2001
From: Chrysostomus <matti@manjaro.org>
Date: Tue, 3 Nov 2020 13:55:24 +0200
Subject: [PATCH 172/228] Use graphical decryption prompt with plymouth as
 adviced here: https://wiki.archlinux.org/index.php/plymouth#The_plymouth_hook

---
 src/modules/initcpiocfg/main.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index aef980e25..6e86b3908 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -123,10 +123,6 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     openswap_hook = False
     unencrypted_separate_boot = False
 
-    # It is important that the plymouth hook comes before any encrypt hook
-    if detect_plymouth():
-        hooks.append("plymouth")
-
     for partition in partitions:
         if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
             # Skip foreign swap
@@ -154,7 +150,10 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
             hooks.append("usr")
 
     if encrypt_hook:
-        hooks.append("encrypt")
+        if detect_plymouth():
+            hooks.append("plymouth-encrypt")
+        else:
+            hooks.append("encrypt")
         if not unencrypted_separate_boot and \
            os.path.isfile(
                os.path.join(root_mount_point, "crypto_keyfile.bin")

From 84558333bfe1e94e40a7964cf4a7ac50a2112f4e Mon Sep 17 00:00:00 2001
From: Chrysostomus <matti@manjaro.org>
Date: Tue, 3 Nov 2020 13:57:19 +0200
Subject: [PATCH 173/228] Regular plymouth hook is also still needed

---
 src/modules/initcpiocfg/main.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/initcpiocfg/main.py b/src/modules/initcpiocfg/main.py
index 6e86b3908..6e3de6931 100644
--- a/src/modules/initcpiocfg/main.py
+++ b/src/modules/initcpiocfg/main.py
@@ -123,6 +123,10 @@ def modify_mkinitcpio_conf(partitions, root_mount_point):
     openswap_hook = False
     unencrypted_separate_boot = False
 
+    # It is important that the plymouth hook comes before any encrypt hook
+    if detect_plymouth():
+        hooks.append("plymouth")
+
     for partition in partitions:
         if partition["fs"] == "linuxswap" and not partition.get("claimed", None):
             # Skip foreign swap

From f898840e16ced0d9b5eada82118b25d7441695b2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 3 Nov 2020 13:02:49 +0100
Subject: [PATCH 174/228] [users] Expand schema to cover new possibilities

---
 src/modules/users/users.schema.yaml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/modules/users/users.schema.yaml b/src/modules/users/users.schema.yaml
index 310df350f..81088032c 100644
--- a/src/modules/users/users.schema.yaml
+++ b/src/modules/users/users.schema.yaml
@@ -11,7 +11,16 @@ properties:
     # Group settings
     defaultGroups:
         type: array
-        items: { type: string }
+        items:
+            oneOf:
+                - type: string
+                - type: object
+                  properties:
+                      name: { type: string }
+                      must_exist: { type: boolean, default: false }
+                      system: { type: boolean, default: false }
+                  additionalProperties: false
+                  required: [ name ]
     autologinGroup: { type: string }
     sudoersGroup: { type: string }
     # Skip login (depends on displaymanager support)

From b6534c3ebff1d9876eca376a3683f49700d42cea Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 3 Nov 2020 15:01:13 +0100
Subject: [PATCH 175/228] Changes: credits adjustment

---
 CHANGES | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 27abd9eef..98db4d483 100644
--- a/CHANGES
+++ b/CHANGES
@@ -14,6 +14,7 @@ This release contains contributions from (alphabetically by first name):
  - Andrius Štikonas
  - Artem Grinev
  - Gaël PORTAY
+ - Matti Hyttinen
  - TTran Me
 
 ## Core ##
@@ -23,6 +24,8 @@ This release contains contributions from (alphabetically by first name):
  - Vietnamese translations have been added. Welcome! (Thanks TTran)
 
 ## Modules ##
+ - The *initcpiocfg* module should support plymouth with encryption
+   now. (Thanks Matti)
  - The *keyboard* and *keyboardq* modules now share backend code
    and handle non-ASCII layouts better (for setting passwords
    and usernames). (Thanks Artem)
@@ -32,7 +35,7 @@ This release contains contributions from (alphabetically by first name):
    user groups -- which may be system groups rather than user-GIDs.
    A new option in each group can require that the group already
    exists in the target system, allowing for better consistency checks
-   with the squashfs.
+   with the squashfs. #1523
 
 
 # 3.2.32.1 (2020-10-17) #

From c7eb8e1d2c5a7133e38c73afa967b37354252fab Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Tue, 3 Nov 2020 15:07:22 +0100
Subject: [PATCH 176/228] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_az.ts    |  8 ++---
 lang/calamares_az_AZ.ts |  8 ++---
 lang/calamares_he.ts    |  2 +-
 lang/calamares_hu.ts    |  2 +-
 lang/calamares_ko.ts    | 74 ++++++++++++++++++++---------------------
 lang/calamares_lt.ts    | 10 +++---
 6 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/lang/calamares_az.ts b/lang/calamares_az.ts
index e73b01885..cad678b40 100644
--- a/lang/calamares_az.ts
+++ b/lang/calamares_az.ts
@@ -619,17 +619,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Bu yaddaş qurğusunda artıq əməliyyat sistemi var, lakin, bölmə cədvəli &lt;strong&gt;%1&lt;/strong&gt;, lazım olan &lt;strong&gt;%2&lt;/strong&gt; ilə fərqlidir.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Bu yaddaş qurğusunda bölmələrdən biri &lt;strong&gt;quraşdırılmışdır&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Bu yaddaş qurğusu &lt;strong&gt;qeyri-aktiv RAİD&lt;/strong&gt; qurğusunun bir hissəsidir.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
@@ -2869,7 +2869,7 @@ Output:
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
       <source>Directory not found</source>
-      <translation type="unfinished"/>
+      <translation>Qovluq tapılmadı</translation>
     </message>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
diff --git a/lang/calamares_az_AZ.ts b/lang/calamares_az_AZ.ts
index 51ef10496..161a04990 100644
--- a/lang/calamares_az_AZ.ts
+++ b/lang/calamares_az_AZ.ts
@@ -619,17 +619,17 @@ Bu proqramdan çıxılacaq və bütün dəyişikliklər itiriləcəkdir.</transl
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Bu yaddaş qurğusunda artıq əməliyyat sistemi var, lakin, bölmə cədvəli &lt;strong&gt;%1&lt;/strong&gt;, lazım olan &lt;strong&gt;%2&lt;/strong&gt; ilə fərqlidir.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Bu yaddaş qurğusunda bölmələrdən biri &lt;strong&gt;quraşdırılmışdır&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Bu yaddaş qurğusu &lt;strong&gt;qeyri-aktiv RAİD&lt;/strong&gt; qurğusunun bir hissəsidir.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
@@ -2869,7 +2869,7 @@ Output:
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
       <source>Directory not found</source>
-      <translation type="unfinished"/>
+      <translation>Qovluq tapılmadı</translation>
     </message>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
diff --git a/lang/calamares_he.ts b/lang/calamares_he.ts
index e87f6bb19..5ed81a899 100644
--- a/lang/calamares_he.ts
+++ b/lang/calamares_he.ts
@@ -437,7 +437,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/libcalamares/PythonHelper.cpp" line="288"/>
       <source>Unknown exception type</source>
-      <translation>טיפוס חריגה אינו מוכר</translation>
+      <translation>סוג חריגה לא מוכר</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/PythonHelper.cpp" line="306"/>
diff --git a/lang/calamares_hu.ts b/lang/calamares_hu.ts
index f7651406c..e0ca6cd41 100644
--- a/lang/calamares_hu.ts
+++ b/lang/calamares_hu.ts
@@ -1620,7 +1620,7 @@ Telepítés nem folytatható. &lt;a href="#details"&gt;Részletek...&lt;/a&gt;</
     <message>
       <location filename="../src/modules/license/LicensePage.ui" line="26"/>
       <source>&lt;h1&gt;License Agreement&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;Licenszszerződés&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/license/LicensePage.cpp" line="136"/>
diff --git a/lang/calamares_ko.ts b/lang/calamares_ko.ts
index 481637f00..3a5820569 100644
--- a/lang/calamares_ko.ts
+++ b/lang/calamares_ko.ts
@@ -304,12 +304,12 @@
     <message>
       <location filename="../src/libcalamaresui/ViewManager.cpp" line="208"/>
       <source>Calamares Initialization Failed</source>
-      <translation>Calamares 초기화 실패</translation>
+      <translation>깔라마레스 초기화 실패</translation>
     </message>
     <message>
       <location filename="../src/libcalamaresui/ViewManager.cpp" line="209"/>
       <source>%1 can not be installed. Calamares was unable to load all of the configured modules. This is a problem with the way Calamares is being used by the distribution.</source>
-      <translation>%1 가 설치될 수 없습니다. Calamares가 모든 구성된 모듈을 불러올 수 없었습니다. 이것은 Calamares가 분포에 의해 사용되는 방식에서 비롯된 문제입니다.</translation>
+      <translation>%1 가 설치될 수 없습니다. 깔라마레스가 모든 구성된 모듈을 불러올 수 없었습니다. 이것은 깔라마레스가 배포판에서 사용되는 방식에서 발생한 문제입니다.</translation>
     </message>
     <message>
       <location filename="../src/libcalamaresui/ViewManager.cpp" line="215"/>
@@ -617,17 +617,17 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>이 스토리지 장치에는 이미 운영 체제가 설치되어 있으나 &lt;strong&gt;%1&lt;/strong&gt; 파티션 테이블이 필요로 하는 &lt;strong&gt;%2&lt;/strong&gt;와 다릅니다.&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>이 스토리지 장치는 하나 이상의 &lt;strong&gt;마운트된&lt;/strong&gt; 파티션을 갖고 있습니다.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>이 스토리지 장치는 &lt;strong&gt;비활성화된 RAID&lt;/strong&gt; 장치의 일부입니다.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
@@ -730,7 +730,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/locale/Config.cpp" line="334"/>
       <source>Set timezone to %1/%2.</source>
-      <translation type="unfinished"/>
+      <translation>표준시간대를 %1/%2로 설정합니다.</translation>
     </message>
     <message>
       <location filename="../src/modules/locale/Config.cpp" line="372"/>
@@ -790,22 +790,22 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="244"/>
       <source>&lt;h1&gt;Welcome to the Calamares setup program for %1&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt; 깔라마레스 설치 프로그램 %1에 오신 것을 환영합니다&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="245"/>
       <source>&lt;h1&gt;Welcome to %1 setup&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1 설치에 오신 것을 환영합니다&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="250"/>
       <source>&lt;h1&gt;Welcome to the Calamares installer for %1&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;깔라마레스 인스톨러 %1에 오신 것을 환영합니다&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/Config.cpp" line="251"/>
       <source>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</source>
-      <translation type="unfinished"/>
+      <translation>&lt;h1&gt;%1 인스톨러에 오신 것을 환영합니다&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="164"/>
@@ -815,7 +815,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="170"/>
       <source>'%1' is not allowed as username.</source>
-      <translation type="unfinished"/>
+      <translation>'%1'은 사용자 이름으로 허용되지 않습니다.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="177"/>
@@ -840,7 +840,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="237"/>
       <source>'%1' is not allowed as hostname.</source>
-      <translation type="unfinished"/>
+      <translation>'%1'은 호스트 이름으로 허용되지 않습니다.</translation>
     </message>
     <message>
       <location filename="../src/modules/users/Config.cpp" line="243"/>
@@ -1813,7 +1813,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/localeq/Map.qml" line="243"/>
       <source>Timezone: %1</source>
-      <translation type="unfinished"/>
+      <translation>표준시간대: %1</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Map.qml" line="264"/>
@@ -1945,7 +1945,7 @@ The installer will quit and all changes will be lost.</source>
     <message>
       <location filename="../src/modules/oemid/OEMPage.ui" line="52"/>
       <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;h1&gt;OEM Configuration&lt;/h1&gt;&lt;p&gt;Calamares will use OEM settings while configuring the target system.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;h1&gt;OEM 구성&lt;/h1&gt; &lt;p&gt;Calamares는 대상 시스템을 구성하는 동안 OEM 설정을 사용합니다.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+      <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;h1&gt;OEM 구성&lt;/h1&gt; &lt;p&gt;깔라마레스는 대상 시스템을 구성하는 동안 OEM 설정을 사용합니다.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
   </context>
   <context>
@@ -1973,22 +1973,22 @@ The installer will quit and all changes will be lost.</source>
       <location filename="../src/modules/localeq/Offline.qml" line="169"/>
       <location filename="../src/modules/localeq/Offline.qml" line="213"/>
       <source>Timezone: %1</source>
-      <translation type="unfinished"/>
+      <translation>표준시간대: %1</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="111"/>
       <source>Select your preferred Zone within your Region.</source>
-      <translation type="unfinished"/>
+      <translation>선호하는 표준시간대와 지역을 선택하세요.</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="182"/>
       <source>Zones</source>
-      <translation type="unfinished"/>
+      <translation>표준시간대</translation>
     </message>
     <message>
       <location filename="../src/modules/localeq/Offline.qml" line="229"/>
       <source>You can fine-tune Language and Locale settings below.</source>
-      <translation type="unfinished"/>
+      <translation>아래에서 언어 및 로케일을 상세하게 설정할 수 있습니다.</translation>
     </message>
   </context>
   <context>
@@ -2864,7 +2864,7 @@ Output:
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
       <source>Directory not found</source>
-      <translation type="unfinished"/>
+      <translation>디렉터리를 찾을 수 없습니다</translation>
     </message>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
@@ -3044,7 +3044,7 @@ Output:
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="176"/>
       <source>Calamares cannot start KPMCore for the file-system resize job.</source>
-      <translation>Calamares는 파일 시스템 크기 조정 작업을 위해 KPMCore를 시작할 수 없습니다.</translation>
+      <translation>깔라마레스는 파일 시스템 크기 조정 작업을 위해 KPMCore를 시작할 수 없습니다.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="184"/>
@@ -3482,18 +3482,18 @@ Output:
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="122"/>
       <source>KDE user feedback</source>
-      <translation type="unfinished"/>
+      <translation>KDE 사용자 의견</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="128"/>
       <source>Configuring KDE user feedback.</source>
-      <translation type="unfinished"/>
+      <translation>KDE 사용자 의견을 설정하는 중입니다.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="150"/>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="156"/>
       <source>Error in KDE user feedback configuration.</source>
-      <translation type="unfinished"/>
+      <translation>KDE 사용자 의견 설정 중에 오류가 발생했습니다.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="151"/>
@@ -3744,7 +3744,7 @@ Output:
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="216"/>
       <source>&lt;h1&gt;Welcome to the Calamares setup program for %1.&lt;/h1&gt;</source>
-      <translation>&lt;h1&gt;%1에 대한 Calamares 설정 프로그램에 오신 것을 환영합니다.&lt;/h1&gt;</translation>
+      <translation>&lt;h1&gt;%1에 대한 깔라마레스 설정 프로그램에 오신 것을 환영합니다.&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="217"/>
@@ -3754,7 +3754,7 @@ Output:
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="222"/>
       <source>&lt;h1&gt;Welcome to the Calamares installer for %1.&lt;/h1&gt;</source>
-      <translation>&lt;h1&gt;%1을 위한 Calamares 설치 관리자에 오신 것을 환영합니다.&lt;/h1&gt;</translation>
+      <translation>&lt;h1&gt;%1을 위한 깔라마레스 설치 관리자에 오신 것을 환영합니다.&lt;/h1&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/welcome/WelcomePage.cpp" line="223"/>
@@ -3877,7 +3877,7 @@ Output:
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
       <source>Keyboard Variant</source>
-      <translation type="unfinished"/>
+      <translation>키보드 유형</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@@ -3890,7 +3890,7 @@ Output:
     <message>
       <location filename="../src/modules/localeq/localeq.qml" line="81"/>
       <source>Change</source>
-      <translation type="unfinished"/>
+      <translation>변경</translation>
     </message>
   </context>
   <context>
@@ -3941,7 +3941,7 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="36"/>
       <source>Pick your user name and credentials to login and perform admin tasks</source>
-      <translation type="unfinished"/>
+      <translation>로그인 및 관리자 작업을 수행하려면 사용자 이름과 자격 증명을 선택하세요</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="52"/>
@@ -3961,7 +3961,7 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="87"/>
       <source>Login Name</source>
-      <translation type="unfinished"/>
+      <translation>로그인 이름</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="103"/>
@@ -4006,7 +4006,7 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="216"/>
       <source>Validate passwords quality</source>
-      <translation type="unfinished"/>
+      <translation>패스워드 품질 검증</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="226"/>
@@ -4016,12 +4016,12 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="234"/>
       <source>Log in automatically without asking for the password</source>
-      <translation type="unfinished"/>
+      <translation>패스워드를 묻지 않고 자동으로 로그인합니다</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="243"/>
       <source>Reuse user password as root password</source>
-      <translation type="unfinished"/>
+      <translation>사용자 패스워드를 루트 패스워드로 재사용합니다</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="253"/>
@@ -4031,22 +4031,22 @@ Output:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="268"/>
       <source>Choose a root password to keep your account safe.</source>
-      <translation type="unfinished"/>
+      <translation>당신의 계정을 안전하게 보호하기 위해서 루트 패스워드를 선택하세요.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="279"/>
       <source>Root Password</source>
-      <translation type="unfinished"/>
+      <translation>루트 패스워드</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="298"/>
       <source>Repeat Root Password</source>
-      <translation type="unfinished"/>
+      <translation>루트 패스워드 확인</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="318"/>
       <source>Enter the same password twice, so that it can be checked for typing errors.</source>
-      <translation type="unfinished"/>
+      <translation>입력 오류를 확인하기 위해서 동일한 패스워드를 두번 입력해주세요.</translation>
     </message>
   </context>
   <context>
@@ -4060,7 +4060,7 @@ Output:
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="66"/>
       <source>About</source>
-      <translation>Calamares에 대하여</translation>
+      <translation>깔라마레스에 대하여</translation>
     </message>
     <message>
       <location filename="../src/modules/welcomeq/welcomeq.qml" line="80"/>
diff --git a/lang/calamares_lt.ts b/lang/calamares_lt.ts
index 676603ca3..0adb509ac 100644
--- a/lang/calamares_lt.ts
+++ b/lang/calamares_lt.ts
@@ -2870,7 +2870,7 @@ Išvestis:
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
       <source>Directory not found</source>
-      <translation type="unfinished"/>
+      <translation>Katalogas nerastas</translation>
     </message>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
@@ -3885,7 +3885,7 @@ Išvestis:
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="276"/>
       <source>Keyboard Variant</source>
-      <translation type="unfinished"/>
+      <translation>Klaviatūros variantas</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="386"/>
@@ -3989,7 +3989,7 @@ Išvestis:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="87"/>
       <source>Login Name</source>
-      <translation type="unfinished"/>
+      <translation>Prisijungimo vardas</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="103"/>
@@ -4009,7 +4009,7 @@ Išvestis:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="140"/>
       <source>This name will be used if you make the computer visible to others on a network.</source>
-      <translation type="unfinished"/>
+      <translation>Šis vardas bus naudojamas, jeigu padarysite savo kompiuterį matomą kitiems naudotojams tinkle.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="155"/>
@@ -4074,7 +4074,7 @@ Išvestis:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="318"/>
       <source>Enter the same password twice, so that it can be checked for typing errors.</source>
-      <translation type="unfinished"/>
+      <translation>Norint įsitikinti, kad rašydami slaptažodį nesuklydote, įrašykite tą patį slaptažodį du kartus.</translation>
     </message>
   </context>
   <context>

From 1ce126c01ee6d36b2f765362c2c50faf9eb43ff9 Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Tue, 3 Nov 2020 15:07:22 +0100
Subject: [PATCH 177/228] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/az/LC_MESSAGES/python.po    | 2 ++
 lang/python/az_AZ/LC_MESSAGES/python.po | 6 ++++--
 lang/python/ko/LC_MESSAGES/python.po    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lang/python/az/LC_MESSAGES/python.po b/lang/python/az/LC_MESSAGES/python.po
index 516429c2d..8637bfe7e 100644
--- a/lang/python/az/LC_MESSAGES/python.po
+++ b/lang/python/az/LC_MESSAGES/python.po
@@ -206,6 +206,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
+"da boşdur və ya təyin olunmamışdır."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
diff --git a/lang/python/az_AZ/LC_MESSAGES/python.po b/lang/python/az_AZ/LC_MESSAGES/python.po
index 5fdf99797..4fb1f949b 100644
--- a/lang/python/az_AZ/LC_MESSAGES/python.po
+++ b/lang/python/az_AZ/LC_MESSAGES/python.po
@@ -206,6 +206,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Ekran menecerləri siyahısı həm qlobal yaddaşda, həm də displaymanager.conf-"
+"da boşdur və ya təyin olunmamışdır."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
@@ -318,11 +320,11 @@ msgstr "Aparat saatını ayarlamaq."
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr "mkinitfs ilə initramfs yaradılır."
+msgstr "mkinitfs ilə initramfs yaradılır"
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr "Hədəfdə dracut başladılmadı"
+msgstr "Hədəfdə mkinitfs başlatmaq baş tutmadı"
 
 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
 msgid "The exit code was {}"
diff --git a/lang/python/ko/LC_MESSAGES/python.po b/lang/python/ko/LC_MESSAGES/python.po
index 7108fb0e0..8b8a891e8 100644
--- a/lang/python/ko/LC_MESSAGES/python.po
+++ b/lang/python/ko/LC_MESSAGES/python.po
@@ -4,7 +4,7 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# 김지현 <potatogim@potatogim.net>, 2018
+# Ji-Hyeon Gim <potatogim@potatogim.net>, 2018
 # JungHee Lee <daemul72@gmail.com>, 2020
 # 
 #, fuzzy

From 356e13ae93db83c83e77934387f75520a4470c2c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 3 Nov 2020 23:46:07 +0100
Subject: [PATCH 178/228] [partition] Improve logging readability

---
 src/modules/partition/gui/EditExistingPartitionDialog.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 1e66c539c..39900430b 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -136,8 +136,8 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
     bool partResizedMoved = newFirstSector != m_partition->firstSector() || newLastSector != m_partition->lastSector();
 
     cDebug() << "old boundaries:" << m_partition->firstSector() << m_partition->lastSector() << m_partition->length();
-    cDebug() << "new boundaries:" << newFirstSector << newLastSector;
-    cDebug() << "dirty status:" << m_partitionSizeController->isDirty();
+    cDebug() << Logger::SubEntry << "new boundaries:" << newFirstSector << newLastSector;
+    cDebug() << Logger::SubEntry << "dirty status:" << m_partitionSizeController->isDirty();
 
     FileSystem::Type fsType = FileSystem::Unknown;
     if ( m_ui->formatRadioButton->isChecked() )

From 87c77d9807f428992e854d48e82b1fa53bee6266 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 00:14:05 +0100
Subject: [PATCH 179/228] [partition] When flags are explicitly invalid, return
 early

---
 src/modules/partition/core/PartitionInfo.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/modules/partition/core/PartitionInfo.cpp b/src/modules/partition/core/PartitionInfo.cpp
index 87aa03b66..9ab59ecf3 100644
--- a/src/modules/partition/core/PartitionInfo.cpp
+++ b/src/modules/partition/core/PartitionInfo.cpp
@@ -52,6 +52,10 @@ PartitionTable::Flags
 flags( const Partition* partition )
 {
     auto v = partition->property( FLAGS_PROPERTY );
+    if ( !v.isValid() )
+    {
+        return partition->activeFlags();
+    }
     if ( v.type() == QVariant::Int )
     {
         return static_cast< PartitionTable::Flags >( v.toInt() );

From 63964de4bdc4ab595570454c4681a162715ba840 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 00:32:21 +0100
Subject: [PATCH 180/228] [partition] Explain underlying type for flags variant

---
 src/modules/partition/core/PartitionInfo.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/modules/partition/core/PartitionInfo.cpp b/src/modules/partition/core/PartitionInfo.cpp
index 9ab59ecf3..c4d239db8 100644
--- a/src/modules/partition/core/PartitionInfo.cpp
+++ b/src/modules/partition/core/PartitionInfo.cpp
@@ -56,7 +56,11 @@ flags( const Partition* partition )
     {
         return partition->activeFlags();
     }
-    if ( v.type() == QVariant::Int )
+    // The underlying type of PartitionTable::Flags can be int or uint
+    // (see qflags.h) and so setting those flags can create a QVariant
+    // of those types; we don't just want to check QVariant::canConvert()
+    // here because that will also accept QByteArray and some other things.
+    if ( v.type() == QVariant::Int || v.type() == QVariant::UInt )
     {
         return static_cast< PartitionTable::Flags >( v.toInt() );
     }

From 949e33f1e8d7573c5691a2c907f62525e4118616 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 00:43:32 +0100
Subject: [PATCH 181/228] [partition] Massage logging while checking for EFI
 boot

---
 src/modules/partition/core/PartUtils.cpp | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 07ab5acc1..bbf63e79d 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -439,10 +439,8 @@ isEfiSystem()
 bool
 isEfiBootable( const Partition* candidate )
 {
-    cDebug() << "Check EFI bootable" << convenienceName( candidate ) << candidate->devicePath();
-    cDebug() << Logger::SubEntry << "flags" << candidate->activeFlags();
-
     auto flags = PartitionInfo::flags( candidate );
+    cDebug() << "Check EFI bootable" << convenienceName( candidate ) << candidate->devicePath() << "flags" << flags;
 
     /* If bit 17 is set, old-style Esp flag, it's OK */
     if ( flags.testFlag( KPM_PARTITION_FLAG_ESP ) )
@@ -455,19 +453,28 @@ isEfiBootable( const Partition* candidate )
     while ( root && !root->isRoot() )
     {
         root = root->parent();
-        cDebug() << Logger::SubEntry << "moved towards root" << Logger::Pointer( root );
     }
 
     // Strange case: no root found, no partition table node?
     if ( !root )
     {
+        cWarning() << "No root of partition table found.";
         return false;
     }
 
     const PartitionTable* table = dynamic_cast< const PartitionTable* >( root );
-    cDebug() << Logger::SubEntry << "partition table" << Logger::Pointer( table ) << "type"
-             << ( table ? table->type() : PartitionTable::TableType::unknownTableType );
-    return table && ( table->type() == PartitionTable::TableType::gpt ) && flags.testFlag( KPM_PARTITION_FLAG( Boot ) );
+    if ( !table )
+    {
+        cWarning() << "Root of partition table is not a PartitionTable object";
+        return false;
+    }
+    if ( table->type() == PartitionTable::TableType::gpt )
+    {
+        const auto bootFlag = KPM_PARTITION_FLAG( Boot );
+        cDebug() << Logger::SubEntry << "GPT table" << flags << "boot?" <<  bootFlag << flags.testFlag( bootFlag );
+        return flags.testFlag( bootFlag );
+    }
+    return false;
 }
 
 QString

From 85bb8c27b3437a6ecd63d002071e3760c17091b8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 00:58:11 +0100
Subject: [PATCH 182/228] [partition] Simplify flags calculations

 - factor out the flags-we-want from the flags-we-already-have
 - the use of ->activeFlags() meant that the state on *disk* was
   being compared with the flags-we-want; if a partition was re-edited,
   then you couldn't change the flags back to the state-on-disk
   (eg. enable a flag, then change your mind and disable it).
 - set the flags before refreshing the partition, because the
   refresh checks for EFI bootability and that needs the new flags,
   not the old ones.
---
 .../gui/EditExistingPartitionDialog.cpp       | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/modules/partition/gui/EditExistingPartitionDialog.cpp b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
index 39900430b..3de6e0c4c 100644
--- a/src/modules/partition/gui/EditExistingPartitionDialog.cpp
+++ b/src/modules/partition/gui/EditExistingPartitionDialog.cpp
@@ -147,6 +147,9 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             : FileSystem::typeForName( m_ui->fileSystemComboBox->currentText() );
     }
 
+    const auto resultFlags = newFlags();
+    const auto currentFlags = PartitionInfo::flags( m_partition );
+
     if ( partResizedMoved )
     {
         if ( m_ui->formatRadioButton->isChecked() )
@@ -157,20 +160,20 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
                                                                       fsType,
                                                                       newFirstSector,
                                                                       newLastSector,
-                                                                      newFlags() );
+                                                                      resultFlags );
             PartitionInfo::setMountPoint( newPartition, PartitionInfo::mountPoint( m_partition ) );
             PartitionInfo::setFormat( newPartition, true );
 
             core->deletePartition( m_device, m_partition );
             core->createPartition( m_device, newPartition );
-            core->setPartitionFlags( m_device, newPartition, newFlags() );
+            core->setPartitionFlags( m_device, newPartition, resultFlags );
         }
         else
         {
             core->resizePartition( m_device, m_partition, newFirstSector, newLastSector );
-            if ( m_partition->activeFlags() != newFlags() )
+            if ( currentFlags != resultFlags )
             {
-                core->setPartitionFlags( m_device, m_partition, newFlags() );
+                core->setPartitionFlags( m_device, m_partition, resultFlags );
             }
         }
     }
@@ -183,9 +186,9 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
             if ( m_partition->fileSystem().type() == fsType )
             {
                 core->formatPartition( m_device, m_partition );
-                if ( m_partition->activeFlags() != newFlags() )
+                if ( currentFlags != resultFlags )
                 {
-                    core->setPartitionFlags( m_device, m_partition, newFlags() );
+                    core->setPartitionFlags( m_device, m_partition, resultFlags );
                 }
             }
             else  // otherwise, we delete and recreate the partition with new fs type
@@ -196,22 +199,22 @@ EditExistingPartitionDialog::applyChanges( PartitionCoreModule* core )
                                                                           fsType,
                                                                           m_partition->firstSector(),
                                                                           m_partition->lastSector(),
-                                                                          newFlags() );
+                                                                          resultFlags );
                 PartitionInfo::setMountPoint( newPartition, PartitionInfo::mountPoint( m_partition ) );
                 PartitionInfo::setFormat( newPartition, true );
 
                 core->deletePartition( m_device, m_partition );
                 core->createPartition( m_device, newPartition );
-                core->setPartitionFlags( m_device, newPartition, newFlags() );
+                core->setPartitionFlags( m_device, newPartition, resultFlags );
             }
         }
         else
         {
-            core->refreshPartition( m_device, m_partition );
-            if ( m_partition->activeFlags() != newFlags() )
+            if ( currentFlags != resultFlags )
             {
-                core->setPartitionFlags( m_device, m_partition, newFlags() );
+                core->setPartitionFlags( m_device, m_partition, resultFlags );
             }
+            core->refreshPartition( m_device, m_partition );
         }
     }
 }

From 15ace5202df15390cea1d9af039dc753894af8b8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 01:16:36 +0100
Subject: [PATCH 183/228] [partition] Simplify EFI-flags checking with KPMCore
 4

---
 src/modules/partition/core/PartUtils.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index bbf63e79d..5cd68c5bf 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -439,9 +439,13 @@ isEfiSystem()
 bool
 isEfiBootable( const Partition* candidate )
 {
-    auto flags = PartitionInfo::flags( candidate );
-    cDebug() << "Check EFI bootable" << convenienceName( candidate ) << candidate->devicePath() << "flags" << flags;
+    const auto flags = PartitionInfo::flags( candidate );
 
+    // TODO: with KPMCore 4, this comment is wrong: the flags
+    //       are remapped, and the ESP flag is the same as Boot.
+#if defined( WITH_KPMCORE4API )
+    return flags.testFlag( KPM_PARTITION_FLAG_ESP );
+#else
     /* If bit 17 is set, old-style Esp flag, it's OK */
     if ( flags.testFlag( KPM_PARTITION_FLAG_ESP ) )
     {
@@ -471,10 +475,10 @@ isEfiBootable( const Partition* candidate )
     if ( table->type() == PartitionTable::TableType::gpt )
     {
         const auto bootFlag = KPM_PARTITION_FLAG( Boot );
-        cDebug() << Logger::SubEntry << "GPT table" << flags << "boot?" <<  bootFlag << flags.testFlag( bootFlag );
         return flags.testFlag( bootFlag );
     }
     return false;
+#endif
 }
 
 QString

From aa5ef7a6b8df086fc1a298e552752d642cf87ad5 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Wed, 4 Nov 2020 03:21:31 +0300
Subject: [PATCH 184/228] [users] New transliterator ID

---
 src/modules/users/Config.cpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 59912a78b..d657a0f2d 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -26,6 +26,12 @@
 #ifdef HAVE_ICU
 #include <unicode/translit.h>
 #include <unicode/unistr.h>
+
+//Did my best choosing compound ID
+static const char* TRANSLITERATOR_ID = "Russian-Latin/BGN;"
+                                       "Greek-Latin/UNGEGN;"
+                                       "Any-Latin;"
+                                       "Latin-ASCII";
 #endif
 
 static const QRegExp USERNAME_RX( "^[a-z_][a-z0-9_-]*[$]?$" );
@@ -290,7 +296,7 @@ transliterate( const QString& input )
 {
     static auto ue = UErrorCode::U_ZERO_ERROR;
     static auto transliterator = std::unique_ptr< icu::Transliterator >(
-                icu::Transliterator::createInstance( "Any-Latin; Latin-ASCII", UTRANS_FORWARD, ue )
+                icu::Transliterator::createInstance( TRANSLITERATOR_ID, UTRANS_FORWARD, ue )
                 );
 
     if( ue != UErrorCode::U_ZERO_ERROR ){

From f20d0a7593344fac924827e10c2ac16a947f9707 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Wed, 4 Nov 2020 03:24:58 +0300
Subject: [PATCH 185/228] [users] Name cleanup after transliteration

---
 src/modules/users/Config.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index d657a0f2d..6a2709e9e 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -372,14 +372,13 @@ Config::setFullName( const QString& name )
         emit fullNameChanged( name );
 
         // Build login and hostname, if needed
-        QString cleanName = CalamaresUtils::removeDiacritics( name ).toLower().simplified();
-
+        static QRegExp rx( "[^a-zA-Z0-9 ]", Qt::CaseInsensitive );
 #ifdef HAVE_ICU
-        cleanName = transliterate(cleanName);
+        QString cleanName = transliterate(name);
 #else
-        QRegExp rx( "[^a-zA-Z0-9 ]", Qt::CaseInsensitive );
-        cleanName.replace( rx, " " );
+        QString cleanName = name;
 #endif
+        cleanName = CalamaresUtils::removeDiacritics( cleanName ).replace( rx, " " ).toLower().simplified();
 
 
         QStringList cleanParts = cleanName.split( ' ' );

From 94f7efb89fa06e6ef14bdecea0c855ca145c49c3 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Wed, 4 Nov 2020 03:37:25 +0300
Subject: [PATCH 186/228] [users] Remove ' from transliterated string

---
 src/modules/users/Config.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 6a2709e9e..e94116bd7 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -375,6 +375,7 @@ Config::setFullName( const QString& name )
         static QRegExp rx( "[^a-zA-Z0-9 ]", Qt::CaseInsensitive );
 #ifdef HAVE_ICU
         QString cleanName = transliterate(name);
+        cleanName.replace("'", "");
 #else
         QString cleanName = name;
 #endif

From 0f38ee624ec77a4c8091bb53385a6fccf337d785 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 09:59:35 +0100
Subject: [PATCH 187/228] [partition] static-assert that our shortcut makes
 sense

---
 src/modules/partition/core/PartUtils.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/partition/core/PartUtils.cpp b/src/modules/partition/core/PartUtils.cpp
index 5cd68c5bf..92bcbace0 100644
--- a/src/modules/partition/core/PartUtils.cpp
+++ b/src/modules/partition/core/PartUtils.cpp
@@ -444,6 +444,7 @@ isEfiBootable( const Partition* candidate )
     // TODO: with KPMCore 4, this comment is wrong: the flags
     //       are remapped, and the ESP flag is the same as Boot.
 #if defined( WITH_KPMCORE4API )
+    static_assert( KPM_PARTITION_FLAG_ESP == KPM_PARTITION_FLAG( Boot ), "KPMCore API enum changed" );
     return flags.testFlag( KPM_PARTITION_FLAG_ESP );
 #else
     /* If bit 17 is set, old-style Esp flag, it's OK */

From 2c297a068feb1cd60a1c3ea46f04803601c57b6c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 12:32:51 +0100
Subject: [PATCH 188/228] [partition] Log when an EFI problem has been solved

---
 src/modules/partition/core/PartitionCoreModule.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/modules/partition/core/PartitionCoreModule.cpp b/src/modules/partition/core/PartitionCoreModule.cpp
index 14ce48b88..254d007c1 100644
--- a/src/modules/partition/core/PartitionCoreModule.cpp
+++ b/src/modules/partition/core/PartitionCoreModule.cpp
@@ -716,6 +716,8 @@ PartitionCoreModule::updateIsDirty()
 void
 PartitionCoreModule::scanForEfiSystemPartitions()
 {
+    const bool wasEmpty = m_efiSystemPartitions.isEmpty();
+
     m_efiSystemPartitions.clear();
 
     QList< Device* > devices;
@@ -732,6 +734,11 @@ PartitionCoreModule::scanForEfiSystemPartitions()
     {
         cWarning() << "system is EFI but no EFI system partitions found.";
     }
+    else if ( wasEmpty )
+    {
+        // But it isn't empty anymore, so whatever problem has been solved
+        cDebug() << "system is EFI and new EFI system partition has been found.";
+    }
 
     m_efiSystemPartitions = efiSystemPartitions;
 }

From 3e51d77782d7684045ec325d8b62b2e809c429b5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 13:39:23 +0100
Subject: [PATCH 189/228] [keyboard] Check for successful file-write

---
 src/modules/keyboard/SetKeyboardLayoutJob.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 419d6f3fc..8a9f5fe38 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -210,7 +210,11 @@ SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const
     }
 
     // Write out the existing lines and replace the KEYMAP= line
-    file.open( QIODevice::WriteOnly | QIODevice::Text );
+    if ( !file.open( QIODevice::WriteOnly | QIODevice::Text ) )
+    {
+        cError() << "Could not open" << file.fileName() << "for writing.";
+        return false;
+    }
     QTextStream stream( &file );
     bool found = false;
     foreach ( const QString& existingLine, existingLines )
@@ -243,7 +247,11 @@ bool
 SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const
 {
     QFile file( keyboardConfPath );
-    file.open( QIODevice::WriteOnly | QIODevice::Text );
+    if ( !file.open( QIODevice::WriteOnly | QIODevice::Text ) )
+    {
+        cError() << "Could not open" << file.fileName() << "for writing.";
+        return false;
+    }
     QTextStream stream( &file );
 
     stream << "# Read and parsed by systemd-localed. It's probably wise not to edit this file\n"

From 845fb3f6da8894f40f2966253a847320ffac31fa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 14:03:14 +0100
Subject: [PATCH 190/228] [keyboard] Refactor writing-various-files

- put the writing of each kind of file in its own block -- this should
  become separate functions -- so that variables become more local
  and debugging can be improved.
- while here, fix the error message for /etc/default/keyboard:
  it would complain and name the vconsole file path if it ever failed.
---
 src/modules/keyboard/SetKeyboardLayoutJob.cpp | 103 ++++++++++--------
 1 file changed, 58 insertions(+), 45 deletions(-)

diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 8a9f5fe38..78459d190 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -337,60 +337,73 @@ SetKeyboardLayoutJob::exec()
     Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
     QDir destDir( gs->value( "rootMountPoint" ).toString() );
 
-    // Get the path to the destination's /etc/vconsole.conf
-    QString vconsoleConfPath = destDir.absoluteFilePath( "etc/vconsole.conf" );
-
-    // Get the path to the destination's /etc/X11/xorg.conf.d/00-keyboard.conf
-    QString xorgConfDPath;
-    QString keyboardConfPath;
-    if ( QDir::isAbsolutePath( m_xOrgConfFileName ) )
     {
-        keyboardConfPath = m_xOrgConfFileName;
-        while ( keyboardConfPath.startsWith( '/' ) )
+        // Get the path to the destination's /etc/vconsole.conf
+        QString vconsoleConfPath = destDir.absoluteFilePath( "etc/vconsole.conf" );
+
+        // Get the path to the destination's path to the converted key mappings
+        QString convertedKeymapPath = m_convertedKeymapPath;
+        if ( !convertedKeymapPath.isEmpty() )
         {
-            keyboardConfPath.remove( 0, 1 );
+            while ( convertedKeymapPath.startsWith( '/' ) )
+            {
+                convertedKeymapPath.remove( 0, 1 );
+            }
+            convertedKeymapPath = destDir.absoluteFilePath( convertedKeymapPath );
         }
-        keyboardConfPath = destDir.absoluteFilePath( keyboardConfPath );
-        xorgConfDPath = QFileInfo( keyboardConfPath ).path();
-    }
-    else
-    {
-        xorgConfDPath = destDir.absoluteFilePath( "etc/X11/xorg.conf.d" );
-        keyboardConfPath = QDir( xorgConfDPath ).absoluteFilePath( m_xOrgConfFileName );
-    }
-    destDir.mkpath( xorgConfDPath );
 
-    QString defaultKeyboardPath;
-    if ( QDir( destDir.absoluteFilePath( "etc/default" ) ).exists() )
-    {
-        defaultKeyboardPath = destDir.absoluteFilePath( "etc/default/keyboard" );
-    }
-
-    // Get the path to the destination's path to the converted key mappings
-    QString convertedKeymapPath = m_convertedKeymapPath;
-    if ( !convertedKeymapPath.isEmpty() )
-    {
-        while ( convertedKeymapPath.startsWith( '/' ) )
+        cDebug() << "Writing VCONSOLE data to" << vconsoleConfPath << convertedKeymapPath;
+        if ( !writeVConsoleData( vconsoleConfPath, convertedKeymapPath ) )
         {
-            convertedKeymapPath.remove( 0, 1 );
+            return Calamares::JobResult::error( tr( "Failed to write keyboard configuration for the virtual console." ),
+                                                tr( "Failed to write to %1" ).arg( vconsoleConfPath ) );
         }
-        convertedKeymapPath = destDir.absoluteFilePath( convertedKeymapPath );
     }
 
-    if ( !writeVConsoleData( vconsoleConfPath, convertedKeymapPath ) )
-        return Calamares::JobResult::error( tr( "Failed to write keyboard configuration for the virtual console." ),
-                                            tr( "Failed to write to %1" ).arg( vconsoleConfPath ) );
-
-    if ( !writeX11Data( keyboardConfPath ) )
-        return Calamares::JobResult::error( tr( "Failed to write keyboard configuration for X11." ),
-                                            tr( "Failed to write to %1" ).arg( keyboardConfPath ) );
-
-    if ( !defaultKeyboardPath.isEmpty() && m_writeEtcDefaultKeyboard )
     {
-        if ( !writeDefaultKeyboardData( defaultKeyboardPath ) )
-            return Calamares::JobResult::error(
-                tr( "Failed to write keyboard configuration to existing /etc/default directory." ),
-                tr( "Failed to write to %1" ).arg( keyboardConfPath ) );
+        // Get the path to the destination's /etc/X11/xorg.conf.d/00-keyboard.conf
+        QString xorgConfDPath;
+        QString keyboardConfPath;
+        if ( QDir::isAbsolutePath( m_xOrgConfFileName ) )
+        {
+            keyboardConfPath = m_xOrgConfFileName;
+            while ( keyboardConfPath.startsWith( '/' ) )
+            {
+                keyboardConfPath.remove( 0, 1 );
+            }
+            keyboardConfPath = destDir.absoluteFilePath( keyboardConfPath );
+            xorgConfDPath = QFileInfo( keyboardConfPath ).path();
+        }
+        else
+        {
+            xorgConfDPath = destDir.absoluteFilePath( "etc/X11/xorg.conf.d" );
+            keyboardConfPath = QDir( xorgConfDPath ).absoluteFilePath( m_xOrgConfFileName );
+        }
+        destDir.mkpath( xorgConfDPath );
+
+        if ( !writeX11Data( keyboardConfPath ) )
+        {
+            return Calamares::JobResult::error( tr( "Failed to write keyboard configuration for X11." ),
+                                                tr( "Failed to write to %1" ).arg( keyboardConfPath ) );
+        }
+    }
+
+    {
+        QString defaultKeyboardPath;
+        if ( QDir( destDir.absoluteFilePath( "etc/default" ) ).exists() )
+        {
+            defaultKeyboardPath = destDir.absoluteFilePath( "etc/default/keyboard" );
+        }
+
+        if ( !defaultKeyboardPath.isEmpty() && m_writeEtcDefaultKeyboard )
+        {
+            if ( !writeDefaultKeyboardData( defaultKeyboardPath ) )
+            {
+                return Calamares::JobResult::error(
+                    tr( "Failed to write keyboard configuration to existing /etc/default directory." ),
+                    tr( "Failed to write to %1" ).arg( defaultKeyboardPath ) );
+            }
+        }
     }
 
     return Calamares::JobResult::ok();

From e9e4be1c60ec8adcf3a16fb98ae9a48a5b5e2e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Tue, 3 Nov 2020 16:53:21 -0500
Subject: [PATCH 191/228] [umount] Fix list of mount-points to unmount

The root mount-point can end with a / while the mount-point read from
the file /etc/mtab does not end with a /.

This leads to skip the unmounting of the root mount-point and causes the
removal of the root mountpoint directory to fail with EBUSY because it
is still mounted.

This uses the python functions os.path.normpath() to normalize the root
mount-point (i.e. to drop the trailing /) and os.path.commonprefix() to
determine the longest common prefix between the two mount-points. If the
returned prefix is identical to the normalized root mount-point then the
mount-point must be added to the list of the mount-points to unmount.

More generally, the python modules should rely on the os.path functions
to compare for paths instead of using strings. It covers this way lots
of corner cases (path with "//", "/../", "/./", ...).
---
 src/modules/umount/main.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/modules/umount/main.py b/src/modules/umount/main.py
index 86ab1599a..0035a6b0f 100644
--- a/src/modules/umount/main.py
+++ b/src/modules/umount/main.py
@@ -39,10 +39,11 @@ def list_mounts(root_mount_point):
     """
     lst = []
 
+    root_mount_point = os.path.normpath(root_mount_point)
     for line in open("/etc/mtab").readlines():
         device, mount_point, _ = line.split(" ", 2)
 
-        if mount_point.startswith(root_mount_point):
+        if os.path.commonprefix([root_mount_point, mount_point]) == root_mount_point:
             lst.append((device, mount_point))
 
     return lst

From e2b00bc51798a3a0b77c77744874f960e5e84412 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Wed, 4 Nov 2020 09:56:06 -0500
Subject: [PATCH 192/228] [partition] Fix typo

---
 src/modules/partition/jobs/FillGlobalStorageJob.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/jobs/FillGlobalStorageJob.cpp b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
index c9040877d..5384cf243 100644
--- a/src/modules/partition/jobs/FillGlobalStorageJob.cpp
+++ b/src/modules/partition/jobs/FillGlobalStorageJob.cpp
@@ -105,7 +105,7 @@ mapForPartition( Partition* partition, const QString& uuid )
     using TR = Logger::DebugRow< const char* const, const QString& >;
     deb << Logger::SubEntry << "mapping for" << partition->partitionPath() << partition->deviceNode()
         << TR( "partlabel", map[ "partlabel" ].toString() ) << TR( "partuuid", map[ "partuuid" ].toString() )
-        << TR( "parttype", map[ "partype" ].toString() ) << TR( "partattrs", map[ "partattrs" ].toString() )
+        << TR( "parttype", map[ "parttype" ].toString() ) << TR( "partattrs", map[ "partattrs" ].toString() )
         << TR( "mountPoint:", PartitionInfo::mountPoint( partition ) ) << TR( "fs:", map[ "fs" ].toString() )
         << TR( "fsName", map[ "fsName" ].toString() ) << TR( "uuid", uuid )
         << TR( "claimed", map[ "claimed" ].toString() );

From 57da222c7231bce0d7903218e864593001c0519d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 16:16:28 +0100
Subject: [PATCH 193/228] [keyboard] Improve debug-logging for vconsole-config

---
 src/modules/keyboard/SetKeyboardLayoutJob.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 78459d190..331c11efb 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -179,6 +179,8 @@ SetKeyboardLayoutJob::findLegacyKeymap() const
 bool
 SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const QString& convertedKeymapPath ) const
 {
+    cDebug() << "Writing vconsole data to" << vconsoleConfPath;
+
     QString keymap = findConvertedKeymap( convertedKeymapPath );
     if ( keymap.isEmpty() )
     {
@@ -205,6 +207,7 @@ SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const
         file.close();
         if ( stream.status() != QTextStream::Ok )
         {
+            cError() << "Could not read lines from" << file.fileName();
             return false;
         }
     }
@@ -217,7 +220,7 @@ SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const
     }
     QTextStream stream( &file );
     bool found = false;
-    foreach ( const QString& existingLine, existingLines )
+    for( const QString& existingLine : qAsConst( existingLines ) )
     {
         if ( existingLine.trimmed().startsWith( "KEYMAP=" ) )
         {
@@ -237,7 +240,7 @@ SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const
     stream.flush();
     file.close();
 
-    cDebug() << "Written KEYMAP=" << keymap << "to vconsole.conf";
+    cDebug() << Logger::SubEntry << "Written KEYMAP=" << keymap << "to vconsole.conf" << stream.status();
 
     return ( stream.status() == QTextStream::Ok );
 }
@@ -352,7 +355,6 @@ SetKeyboardLayoutJob::exec()
             convertedKeymapPath = destDir.absoluteFilePath( convertedKeymapPath );
         }
 
-        cDebug() << "Writing VCONSOLE data to" << vconsoleConfPath << convertedKeymapPath;
         if ( !writeVConsoleData( vconsoleConfPath, convertedKeymapPath ) )
         {
             return Calamares::JobResult::error( tr( "Failed to write keyboard configuration for the virtual console." ),

From cbc376a20666e9aab57f9eae46ae5d1b2ca4bd42 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 16:29:57 +0100
Subject: [PATCH 194/228] [keyboard] Improve debug-logging for writing X11
 config

---
 src/modules/keyboard/SetKeyboardLayoutJob.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 331c11efb..2588608b1 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -249,6 +249,8 @@ SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const
 bool
 SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const
 {
+    cDebug() << "Writing X11 configuration to" << keyboardConfPath;
+
     QFile file( keyboardConfPath );
     if ( !file.open( QIODevice::WriteOnly | QIODevice::Text ) )
     {
@@ -298,8 +300,8 @@ SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const
 
     file.close();
 
-    cDebug() << "Written XkbLayout" << m_layout << "; XkbModel" << m_model << "; XkbVariant" << m_variant
-             << "to X.org file" << keyboardConfPath;
+    cDebug() << Logger::SubEntry << "Written XkbLayout" << m_layout << "; XkbModel" << m_model << "; XkbVariant" << m_variant
+             << "to X.org file" << keyboardConfPath << stream.status();
 
     return ( stream.status() == QTextStream::Ok );
 }

From 705e6dd8d697769000e3a77bfd6a88474a672ea9 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 16:31:35 +0100
Subject: [PATCH 195/228] [keyboard] Improve debug-logging for writing
 etc/default

---
 src/modules/keyboard/SetKeyboardLayoutJob.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 2588608b1..9cf76d96b 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -310,8 +310,14 @@ SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const
 bool
 SetKeyboardLayoutJob::writeDefaultKeyboardData( const QString& defaultKeyboardPath ) const
 {
+    cDebug() << "Writing default keyboard data to" << defaultKeyboardPath;
+
     QFile file( defaultKeyboardPath );
-    file.open( QIODevice::WriteOnly | QIODevice::Text );
+    if ( !file.open( QIODevice::WriteOnly | QIODevice::Text ) )
+    {
+        cError() << "Could not open" << defaultKeyboardPath << "for writing";
+        return false;
+    }
     QTextStream stream( &file );
 
     stream << "# KEYBOARD CONFIGURATION FILE\n\n"
@@ -326,8 +332,8 @@ SetKeyboardLayoutJob::writeDefaultKeyboardData( const QString& defaultKeyboardPa
 
     file.close();
 
-    cDebug() << "Written XKBMODEL" << m_model << "; XKBLAYOUT" << m_layout << "; XKBVARIANT" << m_variant
-             << "to /etc/default/keyboard file" << defaultKeyboardPath;
+    cDebug() << Logger::SubEntry << "Written XKBMODEL" << m_model << "; XKBLAYOUT" << m_layout << "; XKBVARIANT" << m_variant
+             << "to /etc/default/keyboard file" << defaultKeyboardPath << stream.status();
 
     return ( stream.status() == QTextStream::Ok );
 }

From 83d2c06f68540cc16bdcf8e1f4425a35a030ffd0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 16:36:52 +0100
Subject: [PATCH 196/228] [keyboard] Apply coding style

---
 src/modules/keyboard/SetKeyboardLayoutJob.cpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/modules/keyboard/SetKeyboardLayoutJob.cpp b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
index 9cf76d96b..c80d84e7d 100644
--- a/src/modules/keyboard/SetKeyboardLayoutJob.cpp
+++ b/src/modules/keyboard/SetKeyboardLayoutJob.cpp
@@ -220,7 +220,7 @@ SetKeyboardLayoutJob::writeVConsoleData( const QString& vconsoleConfPath, const
     }
     QTextStream stream( &file );
     bool found = false;
-    for( const QString& existingLine : qAsConst( existingLines ) )
+    for ( const QString& existingLine : qAsConst( existingLines ) )
     {
         if ( existingLine.trimmed().startsWith( "KEYMAP=" ) )
         {
@@ -300,8 +300,8 @@ SetKeyboardLayoutJob::writeX11Data( const QString& keyboardConfPath ) const
 
     file.close();
 
-    cDebug() << Logger::SubEntry << "Written XkbLayout" << m_layout << "; XkbModel" << m_model << "; XkbVariant" << m_variant
-             << "to X.org file" << keyboardConfPath << stream.status();
+    cDebug() << Logger::SubEntry << "Written XkbLayout" << m_layout << "; XkbModel" << m_model << "; XkbVariant"
+             << m_variant << "to X.org file" << keyboardConfPath << stream.status();
 
     return ( stream.status() == QTextStream::Ok );
 }
@@ -332,8 +332,8 @@ SetKeyboardLayoutJob::writeDefaultKeyboardData( const QString& defaultKeyboardPa
 
     file.close();
 
-    cDebug() << Logger::SubEntry << "Written XKBMODEL" << m_model << "; XKBLAYOUT" << m_layout << "; XKBVARIANT" << m_variant
-             << "to /etc/default/keyboard file" << defaultKeyboardPath << stream.status();
+    cDebug() << Logger::SubEntry << "Written XKBMODEL" << m_model << "; XKBLAYOUT" << m_layout << "; XKBVARIANT"
+             << m_variant << "to /etc/default/keyboard file" << defaultKeyboardPath << stream.status();
 
     return ( stream.status() == QTextStream::Ok );
 }

From e023da3f3571c4cf80ee4abfbcc8160d421e914b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 4 Nov 2020 18:30:48 +0100
Subject: [PATCH 197/228] i18n: update Tajik keyboard translations

 - real ones this time, not my made-up nonsense
---
 lang/kb_tg.ts | 622 +++++++++++++++++++++++++-------------------------
 1 file changed, 311 insertions(+), 311 deletions(-)

diff --git a/lang/kb_tg.ts b/lang/kb_tg.ts
index fb18f9995..893bed9ae 100644
--- a/lang/kb_tg.ts
+++ b/lang/kb_tg.ts
@@ -1,205 +1,205 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <!DOCTYPE TS>
-<TS version="2.1" language="en_US">
+<TS language="tg" version="2.1">
 <context>
     <name>kb_layouts</name>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="229"/>
         <source>Afghani</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Афғонӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="230"/>
         <source>Albanian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Албанӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="231"/>
         <source>Amharic</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Амҳарӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="232"/>
         <source>Arabic</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="233"/>
         <source>Arabic (Morocco)</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (Марокаш)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="234"/>
         <source>Arabic (Syria)</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (Сурия)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="235"/>
         <source>Armenian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арманӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="236"/>
         <source>Azerbaijani</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Озарбойҷонӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="237"/>
         <source>Bambara</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бамбара</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="238"/>
         <source>Bangla</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бангла</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="239"/>
         <source>Belarusian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белорусӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="240"/>
         <source>Belgian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белгиягӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="241"/>
         <source>Bosnian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Босниягӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="242"/>
         <source>Braille</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Брайл</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="243"/>
         <source>Bulgarian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Булғорӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="244"/>
         <source>Burmese</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бирманӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="245"/>
         <source>Chinese</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Хитоӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="246"/>
         <source>Croatian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Хорватӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="247"/>
         <source>Czech</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Чехӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="248"/>
         <source>Danish</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Даниягӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="249"/>
         <source>Dhivehi</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Дхивеҳӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="250"/>
         <source>Dutch</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ҳоландӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="251"/>
         <source>Dzongkha</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Дзонгха</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="252"/>
         <source>English (Australian)</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Австралиягӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="253"/>
         <source>English (Cameroon)</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Камерун)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="254"/>
         <source>English (Ghana)</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Гана)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="255"/>
         <source>English (Nigeria)</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Нигерия)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="256"/>
         <source>English (South Africa)</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Африкаи Ҷунубӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="257"/>
         <source>English (UK)</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (БК)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="258"/>
         <source>English (US)</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (ИМА)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="259"/>
         <source>Esperanto</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Эсперанто</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="260"/>
         <source>Estonian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Эстонӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="261"/>
         <source>Faroese</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Фарерӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="262"/>
@@ -475,7 +475,7 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="307"/>
         <source>Russian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="308"/>
@@ -565,13 +565,13 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="322"/>
         <source>Turkmen</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Туркменӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="323"/>
         <source>Ukrainian</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Украинӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="324"/>
@@ -583,19 +583,19 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="325"/>
         <source>Uzbek</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ӯзбекӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="326"/>
         <source>Vietnamese</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ветнамӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="327"/>
         <source>Wolof</source>
         <comment>kb_layouts</comment>
-        <translation type="unfinished"></translation>
+        <translation>Волоф</translation>
     </message>
 </context>
 <context>
@@ -604,385 +604,385 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="25"/>
         <source>A4Tech KB-21</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>A4Tech KB-21</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="26"/>
         <source>A4Tech KBS-8</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>A4Tech KBS-8</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="27"/>
         <source>A4Tech Wireless Desktop RFKB-23</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Мизи кории бесими A4Tech RFKB-23</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="28"/>
         <source>Acer AirKey V</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Acer AirKey V</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="29"/>
         <source>Acer C300</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Acer C300</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="30"/>
         <source>Acer Ferrari 4000</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Acer Ferrari 4000</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="31"/>
         <source>Acer laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи Acer</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="32"/>
         <source>Advance Scorpius KI</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Scorpius KI-и пешрафта</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="33"/>
         <source>Apple</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Apple</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="34"/>
         <source>Apple Aluminium (ANSI)</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Apple-и Алюминий (ANSI)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="35"/>
         <source>Apple Aluminium (ISO)</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Apple-и Алюминий (ISO)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="36"/>
         <source>Apple Aluminium (JIS)</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Apple-и Алюминий (JIS)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="37"/>
         <source>Apple laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи Apple</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="38"/>
         <source>Asus laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи Asus</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="39"/>
         <source>Azona RF2300 wireless Internet</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Azona RF2300 Интернети бесим</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="40"/>
         <source>BTC 5090</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BTC 5090</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="41"/>
         <source>BTC 5113RF Multimedia</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BTC 5113RF Мултимедиа</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="42"/>
         <source>BTC 5126T</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BTC 5126T</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="43"/>
         <source>BTC 6301URF</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BTC 6301URF</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="44"/>
         <source>BTC 9000</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BTC 9000</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="45"/>
         <source>BTC 9000A</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BTC 9000A</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="46"/>
         <source>BTC 9001AH</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BTC 9001AH</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="47"/>
         <source>BTC 9019U</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BTC 9019U</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="48"/>
         <source>BTC 9116U Mini Wireless Internet and Gaming</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BTC 9116U Бозиҳо ва Интернети бесим (Хурд)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="49"/>
         <source>BenQ X-Touch</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BenQ X-Touch</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="50"/>
         <source>BenQ X-Touch 730</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BenQ X-Touch 730</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="51"/>
         <source>BenQ X-Touch 800</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>BenQ X-Touch 800</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="52"/>
         <source>Brother Internet</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Интернети бародарон</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="53"/>
         <source>Cherry B.UNLIMITED</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Черри, НОМАҲДУДИ B</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="54"/>
         <source>Cherry Blue Line CyBo@rd</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Черри, Хати кабуди CyBo@rd</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="55"/>
         <source>Cherry Blue Line CyBo@rd (alt.)</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Черри, Хати кабуди CyBo@rd. (илов.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="56"/>
         <source>Cherry CyBo@rd USB-Hub</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Черри, CyBo@rd USB-Hub</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="57"/>
         <source>Cherry CyMotion Expert</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Черри, Коршиноси CyMotion</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="58"/>
         <source>Cherry CyMotion Master Linux</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Черри, Устои Linux-и CyMotion</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="59"/>
         <source>Cherry CyMotion Master XPress</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Черри, Устои XPress-и CyMotion</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="60"/>
         <source>Chicony Internet</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Chicony-и интернетӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="61"/>
         <source>Chicony KB-9885</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Chicony KB-9885</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="62"/>
         <source>Chicony KU-0108</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Chicony KU-0108</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="63"/>
         <source>Chicony KU-0420</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Chicony KU-0420</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="64"/>
         <source>Chromebook</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Хромбук</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="65"/>
         <source>Classmate PC</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Classmate PC</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="66"/>
         <source>Compaq Armada laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи Compaq Armada</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="67"/>
         <source>Compaq Easy Access</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Дастрасии осони Compaq</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="68"/>
         <source>Compaq Internet (13 keys)</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Compaq-и интернетӣ (13 тугма)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="69"/>
         <source>Compaq Internet (18 keys)</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Compaq-и интернетӣ (18 тугма)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="70"/>
         <source>Compaq Internet (7 keys)</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Compaq-и интернетӣ (7 тугма)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="71"/>
         <source>Compaq Presario laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи Compaq Presario</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="72"/>
         <source>Compaq iPaq</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Compaq iPaq</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="73"/>
         <source>Creative Desktop Wireless 7000</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Creative Desktop Wireless 7000</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="74"/>
         <source>DTK2000</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>DTK2000</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="75"/>
         <source>Dell</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dell</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="76"/>
         <source>Dell 101-key PC</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dell, 101 тугмаи компютерӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="77"/>
         <source>Dell Inspiron 6000/8000 laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи Dell Inspiron 6000/8000</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="78"/>
         <source>Dell Latitude laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи Dell Latitude</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="79"/>
         <source>Dell Precision M laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи Dell Precision M</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="80"/>
         <source>Dell Precision M65 laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи Dell Precision M65</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="81"/>
         <source>Dell SK-8125</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dell SK-8125</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="82"/>
         <source>Dell SK-8135</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dell SK-8135</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="83"/>
         <source>Dell USB Multimedia</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Dell, Мултимедиаи USB</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="84"/>
         <source>Dexxa Wireless Desktop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Мизи кории бесими Dexxa</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="85"/>
         <source>Diamond 9801/9802</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Diamond 9801/9802</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="86"/>
         <source>Ennyah DKB-1008</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ennyah DKB-1008</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="87"/>
         <source>Everex STEPnote</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Everex STEPnote</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="88"/>
         <source>FL90</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>FL90</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="89"/>
@@ -994,37 +994,37 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="90"/>
         <source>Generic 101-key PC</source>
         <comment>kb_models</comment>
-        <translation>Общий 101-ключ</translation>
+        <translation>Умумӣ, 101 тугмаи компютерӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="91"/>
         <source>Generic 102-key PC</source>
         <comment>kb_models</comment>
-        <translation>Общий 102-ключ</translation>
+        <translation>Умумӣ, 102 тугмаи компютерӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="92"/>
         <source>Generic 104-key PC</source>
         <comment>kb_models</comment>
-        <translation>Общий 104-ключ</translation>
+        <translation>Умумӣ, 104 тугмаи компютерӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="93"/>
         <source>Generic 104-key PC with L-shaped Enter key</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Умумӣ, 104 тугмаи компютерӣ бо тугмаи Enter дар шакли L</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="94"/>
         <source>Generic 105-key PC</source>
         <comment>kb_models</comment>
-        <translation>Общий 105-ключ</translation>
+        <translation>Умумӣ, 105 тугмаи компютерӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="95"/>
         <source>Generic 86-key PC</source>
         <comment>kb_models</comment>
-        <translation>Общий 86-ключ</translation>
+        <translation>Умумӣ, 86 тугмаи компютерӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="96"/>
@@ -1204,13 +1204,13 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="125"/>
         <source>Logitech</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Logitech</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="126"/>
         <source>Logitech Access</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Logitech Access</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="127"/>
@@ -1366,25 +1366,25 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="152"/>
         <source>Memorex MX1998</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Memorex MX1998</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="153"/>
         <source>Memorex MX2500 EZ-Access</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Memorex MX2500 EZ-Access</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="154"/>
         <source>Memorex MX2750</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Memorex MX2750</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="155"/>
         <source>Microsoft Comfort Curve 2000</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Microsoft Comfort Curve 2000</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="156"/>
@@ -1462,25 +1462,25 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="168"/>
         <source>NEC SK-1300</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>NEC SK-1300</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="169"/>
         <source>NEC SK-2500</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>NEC SK-2500</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="170"/>
         <source>NEC SK-6200</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>NEC SK-6200</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="171"/>
         <source>NEC SK-7100</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>NEC SK-7100</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="172"/>
@@ -1492,7 +1492,7 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="173"/>
         <source>OLPC</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>OLPC</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="174"/>
@@ -1522,25 +1522,25 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="178"/>
         <source>SVEN Ergonomic 2500</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>SVEN Ergonomic 2500</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="179"/>
         <source>SVEN Slim 303</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>SVEN Slim 303</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="180"/>
         <source>Samsung SDM 4500P</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Samsung SDM 4500P</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="181"/>
         <source>Samsung SDM 4510P</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Samsung SDM 4510P</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="182"/>
@@ -1684,61 +1684,61 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="205"/>
         <source>TypeMatrix EZ-Reach 2020</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>TypeMatrix EZ-Reach 2020</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="206"/>
         <source>TypeMatrix EZ-Reach 2030 PS2</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>TypeMatrix EZ-Reach 2030 PS2</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="207"/>
         <source>TypeMatrix EZ-Reach 2030 USB</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>TypeMatrix EZ-Reach 2030 USB</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="208"/>
         <source>TypeMatrix EZ-Reach 2030 USB (102/105:EU mode)</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>TypeMatrix EZ-Reach 2030 USB (Реҷаи 102/105:EU)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="209"/>
         <source>TypeMatrix EZ-Reach 2030 USB (106:JP mode)</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>TypeMatrix EZ-Reach 2030 USB (Реҷаи 106:JP)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="210"/>
         <source>Unitek KB-1925</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Unitek KB-1925</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="211"/>
         <source>ViewSonic KU-306 Internet</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>ViewSonic KU-306-и интернетӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="212"/>
         <source>Winbook Model XP5</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="213"/>
         <source>Yahoo! Internet</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Yahoo! Интернет</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="214"/>
         <source>eMachines m6800 laptop</source>
         <comment>kb_models</comment>
-        <translation type="unfinished"></translation>
+        <translation>Лэптопи eMachines m6800</translation>
     </message>
 </context>
 <context>
@@ -1747,775 +1747,775 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="342"/>
         <source>Akan</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Аконӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="343"/>
         <source>Albanian (Plisi)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Албанӣ (Плисӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="344"/>
         <source>Albanian (Veqilharxhi)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Албанӣ (Векилхаркшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="345"/>
         <source>Arabic (AZERTY)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (AZERTY)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="346"/>
         <source>Arabic (AZERTY, Eastern Arabic numerals)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (AZERTY, Рақамҳои арабии шаркӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="347"/>
         <source>Arabic (Algeria)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (Алҷазоир)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="348"/>
         <source>Arabic (Buckwalter)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (Бакуолтер)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="349"/>
         <source>Arabic (Eastern Arabic numerals)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (Рақамҳои арабии шаркӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="350"/>
         <source>Arabic (Macintosh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (Макинтош)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="351"/>
         <source>Arabic (OLPC)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (OLPC)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="352"/>
         <source>Arabic (Pakistan)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (Покистон)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="353"/>
         <source>Arabic (QWERTY)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (QWERTY)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="354"/>
         <source>Arabic (QWERTY, Eastern Arabic numerals)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арабӣ (QWERTY, Рақамҳои арабии шаркӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="355"/>
         <source>Armenian (alt. eastern)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арманӣ (илов. шарқӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="356"/>
         <source>Armenian (alt. phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арманӣ (илов. фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="357"/>
         <source>Armenian (eastern)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арманӣ (шарқӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="358"/>
         <source>Armenian (phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арманӣ (фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="359"/>
         <source>Armenian (western)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Арманӣ (ғарбӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="360"/>
         <source>Asturian (Spain, with bottom-dot H and L)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Астурӣ (Испания, бо нуқтаи поёни H ва L)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="361"/>
         <source>Avatime</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Avatime</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="362"/>
         <source>Azerbaijani (Cyrillic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Озарбойҷонӣ (Кириллӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="363"/>
         <source>Bangla (India)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бангла (Ҳиндустон)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="364"/>
         <source>Bangla (India, Baishakhi Inscript)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бангла (Ҳиндустон, Инскрипти Байшахӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="365"/>
         <source>Bangla (India, Baishakhi)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бангла (Ҳиндустон, Байшахӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="366"/>
         <source>Bangla (India, Bornona)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бангла (Ҳиндустон, Борнона)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="367"/>
         <source>Bangla (India, Gitanjali)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бангла (Ҳиндустон, Гитанҷалӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="368"/>
         <source>Bangla (India, Probhat)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бангла (Ҳиндустон, Пробхат)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="369"/>
         <source>Bangla (Probhat)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бангла (Пробхат)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="370"/>
         <source>Bashkirian</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бошқирдӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="371"/>
         <source>Belarusian (Latin)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белорусӣ (Лотинӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="372"/>
         <source>Belarusian (intl.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белорусӣ (байналм.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="373"/>
         <source>Belarusian (legacy)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белорусӣ (ворисӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="374"/>
         <source>Belgian (ISO, alt.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белгиягӣ (ISO, илов.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="375"/>
         <source>Belgian (Latin-9 only, alt.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белгиягӣ (Танҳо лотинии-9, илов.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="376"/>
         <source>Belgian (Sun dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белгиягӣ (Тугмаҳои хомӯшии Sun)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="377"/>
         <source>Belgian (Sun dead keys, alt.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белгиягӣ (Тугмаҳои хомӯшии Sun, илов.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="378"/>
         <source>Belgian (Wang 724 AZERTY)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белгиягӣ (Ванг 724 AZERTY)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="379"/>
         <source>Belgian (alt.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белгиягӣ (илов.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="380"/>
         <source>Belgian (no dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Белгиягӣ (бе тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="381"/>
         <source>Berber (Morocco, Tifinagh alt.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Берберӣ (Марокаш, Тифинагҳӣ, илов.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="382"/>
         <source>Berber (Morocco, Tifinagh extended phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Берберӣ (Марокаш, Тифинагҳӣ, фонетикии васеъшуда)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="383"/>
         <source>Berber (Morocco, Tifinagh extended)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Берберӣ (Марокаш, Тифинагҳӣ, васеъшуда)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="384"/>
         <source>Berber (Morocco, Tifinagh phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Берберӣ (Марокаш, Тифинагҳӣ, фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="385"/>
         <source>Berber (Morocco, Tifinagh phonetic, alt.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Берберӣ (Марокаш, Тифинагҳӣ, фонетикӣ, илов.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="386"/>
         <source>Berber (Morocco, Tifinagh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Берберӣ (Марокаш, Тифинагҳӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="387"/>
         <source>Bosnian (US)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Босниягӣ (ИМА)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="388"/>
         <source>Bosnian (US, with Bosnian digraphs)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Босниягӣ (ИМА, бо диграфҳои босниягӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="389"/>
         <source>Bosnian (with Bosnian digraphs)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Босниягӣ (бо диграфҳои босниягӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="390"/>
         <source>Bosnian (with guillemets)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Босниягӣ (бо гиллеметҳо)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="391"/>
         <source>Braille (left-handed inverted thumb)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Брайл (сарангушти чаппаи дасти чап)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="392"/>
         <source>Braille (left-handed)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Брайл (дасти чап)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="393"/>
         <source>Braille (right-handed inverted thumb)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Брайл (сарангушти чаппаи дасти рост)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="394"/>
         <source>Braille (right-handed)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Брайл (дасти рост)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="395"/>
         <source>Bulgarian (enhanced)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Булғорӣ (такмилёфта)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="396"/>
         <source>Bulgarian (new phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Булғорӣ (фонетикии нав)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="397"/>
         <source>Bulgarian (traditional phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Булғорӣ (фонетикии анъанавӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="398"/>
         <source>Burmese Zawgyi</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Бирмании завҷӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="399"/>
         <source>Cameroon (AZERTY, intl.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Камерун (AZERTY, байналм.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="400"/>
         <source>Cameroon (Dvorak, intl.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Камерун (Дворак, байналм.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="401"/>
         <source>Cameroon Multilingual (QWERTY, intl.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Камеруни серзабон (QWERTY, байналм.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="402"/>
         <source>Canadian (intl.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Канадагӣ (байналм.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="403"/>
         <source>Canadian (intl., 1st part)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Канадагӣ (байналм. қисми 1)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="404"/>
         <source>Canadian (intl., 2nd part)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Канадагӣ (байналм. қисми 2)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="405"/>
         <source>Catalan (Spain, with middle-dot L)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Каталонӣ (Испания, бо нуқтаи миёнаи L)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="406"/>
         <source>Cherokee</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Черокӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="407"/>
         <source>Chuvash</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Чувашӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="408"/>
         <source>Chuvash (Latin)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Чувашӣ (Лотинӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="409"/>
         <source>CloGaelach</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>CloGaelach</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="410"/>
         <source>Crimean Tatar (Turkish Alt-Q)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Тотории кримӣ (Туркӣ, Alt-Q)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="411"/>
         <source>Crimean Tatar (Turkish F)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Тотории кримӣ (F-и туркӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="412"/>
         <source>Crimean Tatar (Turkish Q)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Тотории кримӣ (Q-и туркӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="413"/>
         <source>Croatian (US)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Хорватӣ (ИМА)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="414"/>
         <source>Croatian (US, with Croatian digraphs)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Хорватӣ (ИМА, бо диграфҳои хорватӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="415"/>
         <source>Croatian (with Croatian digraphs)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Хорватӣ (бо диграфҳои хорватӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="416"/>
         <source>Croatian (with guillemets)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Хорватӣ (бо гиллеметҳо)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="417"/>
         <source>Czech (QWERTY)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Чехӣ (QWERTY)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="418"/>
         <source>Czech (QWERTY, Macintosh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Чехӣ (QWERTY, Макинтош)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="419"/>
         <source>Czech (QWERTY, extended backslash)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Чехӣ (QWERTY, аломати хати каҷи баръакси васеъшуда)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="420"/>
         <source>Czech (UCW, only accented letters)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Чехӣ (UCW, танҳо ҳарфҳои вижагӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="421"/>
         <source>Czech (US, Dvorak, UCW support)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Чехӣ (ИМА, Дворак, дастгирии UCW)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="422"/>
         <source>Czech (with &amp;lt;|&amp;gt; key)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Чехӣ (бо тугмаи &amp;lt;|&amp;gt;)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="423"/>
         <source>Danish (Dvorak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Даниягӣ (Дворак)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="424"/>
         <source>Danish (Macintosh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Даниягӣ (Макинтош)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="425"/>
         <source>Danish (Macintosh, no dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Даниягӣ (Макинтош, бе тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="426"/>
         <source>Danish (Windows)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Даниягӣ (Windows)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="427"/>
         <source>Danish (no dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Даниягӣ (бе тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="428"/>
         <source>Default</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Стандартӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="429"/>
         <source>Dutch (Macintosh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ҳоландӣ (Макинтош)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="430"/>
         <source>Dutch (Sun dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ҳоландӣ (Тугмаҳои хомӯшии Sun)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="431"/>
         <source>Dutch (standard)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ҳоландӣ (стандартӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="432"/>
         <source>English (Canada)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Канада)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="433"/>
         <source>English (Colemak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Колемак)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="434"/>
         <source>English (Dvorak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Дворак)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="435"/>
         <source>English (Dvorak, alt. intl.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Дворак, илов. байналм.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="436"/>
         <source>English (Dvorak, intl., with dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Дворак, байналм. бо тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="437"/>
         <source>English (Dvorak, left-handed)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Дворак, дасти чап)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="438"/>
         <source>English (Dvorak, right-handed)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Дворак, дасти рост)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="439"/>
         <source>English (Ghana, GILLBT)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Гана, GILLBT)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="440"/>
         <source>English (Ghana, multilingual)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Гана, серзабон)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="441"/>
         <source>English (India, with rupee)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Ҳиндустон, бо рупия)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="442"/>
         <source>English (Macintosh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Макинтош)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="443"/>
         <source>English (Mali, US, Macintosh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Малӣ, ИМА, Макинтош)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="444"/>
         <source>English (Mali, US, intl.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Малӣ, ИМА, байналм.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="445"/>
         <source>English (Norman)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Норман)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="446"/>
         <source>English (UK, Colemak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (БК, Колемак)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="447"/>
         <source>English (UK, Dvorak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (БК, Дворак)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="448"/>
         <source>English (UK, Dvorak, with UK punctuation)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (БК, Дворак, бо аломатҳои китобатӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="449"/>
         <source>English (UK, Macintosh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (БК, Макинтош)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="450"/>
         <source>English (UK, Macintosh, intl.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (БК, Макинтош, байналм.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="451"/>
         <source>English (UK, extended, Windows)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (БК, васеъшуда, Windows)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="452"/>
         <source>English (UK, intl., with dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (БК, байналм., бо тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="453"/>
         <source>English (US, Symbolic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (ИМА, Рамзӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="454"/>
         <source>English (US, alt. intl.)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (ИМА, илов. байналм.)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="455"/>
         <source>English (US, euro on 5)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (ИМА, евро дар 5)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="456"/>
         <source>English (US, intl., with dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (ИМА, байналм., бо тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="457"/>
         <source>English (Workman)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Воркман)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="458"/>
         <source>English (Workman, intl., with dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Воркман, байналм., бо тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="459"/>
         <source>English (classic Dvorak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Двораки классикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="460"/>
         <source>English (intl., with AltGr dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (байналм., бо тугмаҳои хомӯшии AltGr)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="461"/>
         <source>English (programmer Dvorak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (Двораки барномарезӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="462"/>
         <source>English (the divide/multiply toggle the layout)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Англисӣ (тарҳбандӣ бо алоҳида/якчанд васлкунак)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="463"/>
         <source>Esperanto (Brazil, Nativo)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Эсперанто (Бразилия, Нативо)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="464"/>
         <source>Esperanto (Portugal, Nativo)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Эсперанто (Португалия, Нативо)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="465"/>
         <source>Esperanto (legacy)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Эсперанто (ворисӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="466"/>
         <source>Estonian (Dvorak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Эстонӣ (Дворак)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="467"/>
         <source>Estonian (US)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Эстонӣ (ИМА)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="468"/>
         <source>Estonian (no dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Эстонӣ (бе тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="469"/>
         <source>Ewe</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ewe</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="470"/>
         <source>Faroese (no dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Фарерӣ (бе тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="471"/>
@@ -3985,127 +3985,127 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="715"/>
         <source>Russian (Belarus)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Беларус)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="716"/>
         <source>Russian (Czech, phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Чехӣ, фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="717"/>
         <source>Russian (DOS)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (DOS)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="718"/>
         <source>Russian (Georgia)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Гурҷӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="719"/>
         <source>Russian (Germany, phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Немисӣ, фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="720"/>
         <source>Russian (Kazakhstan, with Kazakh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Қазоқистон, бо қазоқӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="721"/>
         <source>Russian (Macintosh)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Макинтош)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="722"/>
         <source>Russian (Poland, phonetic Dvorak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Полша, Дворакии фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="723"/>
         <source>Russian (Sweden, phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Шведӣ, фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="724"/>
         <source>Russian (Sweden, phonetic, no dead keys)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Шведӣ, фонетикӣ, бе тугмаҳои хомӯшӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="725"/>
         <source>Russian (US, phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (ИМА, фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="726"/>
         <source>Russian (Ukraine, standard RSTU)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (Украина, RSTU-и стандартӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="727"/>
         <source>Russian (legacy)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (ворисӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="728"/>
         <source>Russian (phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="729"/>
         <source>Russian (phonetic, AZERTY)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (фонетикӣ, AZERTY)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="730"/>
         <source>Russian (phonetic, Dvorak)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (фонетикӣ, Дворак)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="731"/>
         <source>Russian (phonetic, French)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (фонетикӣ, Франсузӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="732"/>
         <source>Russian (phonetic, Windows)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (фонетикӣ, Windows)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="733"/>
         <source>Russian (phonetic, YAZHERTY)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (фонетикӣ, YAZHERTY)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="734"/>
         <source>Russian (typewriter)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (мошини хатнависӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="735"/>
         <source>Russian (typewriter, legacy)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Русӣ (мошини хатнависӣ, ворисӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="736"/>
@@ -4117,7 +4117,7 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="737"/>
         <source>Samogitian</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="738"/>
@@ -4369,7 +4369,7 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="779"/>
         <source>Tajik (legacy)</source>
         <comment>kb_variants</comment>
-        <translation>Тоҷикӣ (красіво)</translation>
+        <translation>Тоҷикӣ (ворисӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="780"/>
@@ -4379,37 +4379,37 @@
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="781"/>
-        <source>Tamil (Sri Lanka, TamilNet &apos;99)</source>
+        <source>Tamil (Sri Lanka, TamilNet '99)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="782"/>
-        <source>Tamil (Sri Lanka, TamilNet &apos;99, TAB encoding)</source>
+        <source>Tamil (Sri Lanka, TamilNet '99, TAB encoding)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="783"/>
-        <source>Tamil (TamilNet &apos;99 with Tamil numerals)</source>
+        <source>Tamil (TamilNet '99 with Tamil numerals)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="784"/>
-        <source>Tamil (TamilNet &apos;99)</source>
+        <source>Tamil (TamilNet '99)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="785"/>
-        <source>Tamil (TamilNet &apos;99, TAB encoding)</source>
+        <source>Tamil (TamilNet '99, TAB encoding)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="786"/>
-        <source>Tamil (TamilNet &apos;99, TSCII encoding)</source>
+        <source>Tamil (TamilNet '99, TSCII encoding)</source>
         <comment>kb_variants</comment>
         <translation type="unfinished"></translation>
     </message>
@@ -4417,7 +4417,7 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="787"/>
         <source>Tatar</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Тоторӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="788"/>
@@ -4495,49 +4495,49 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="800"/>
         <source>Turkmen (Alt-Q)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Туркменӣ (Alt-Q)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="801"/>
         <source>Udmurt</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Удмуртӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="802"/>
         <source>Ukrainian (Windows)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Украинӣ (Windows)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="803"/>
         <source>Ukrainian (homophonic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Украинӣ (гомофонӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="804"/>
         <source>Ukrainian (legacy)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Украинӣ (ворисӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="805"/>
         <source>Ukrainian (phonetic)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Украинӣ (фонетикӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="806"/>
         <source>Ukrainian (standard RSTU)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Украинӣ (RSTU-и стандартӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="807"/>
         <source>Ukrainian (typewriter)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Украинӣ (мошини хатнависӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="808"/>
@@ -4573,49 +4573,49 @@
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="813"/>
         <source>Uyghur</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ӯйғурӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="814"/>
         <source>Uzbek (Afghanistan)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ӯзбекӣ (Афғонистон)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="815"/>
         <source>Uzbek (Afghanistan, OLPC)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ӯзбекӣ (Афғонистон, OLPC)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="816"/>
         <source>Uzbek (Latin)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ӯзбекӣ (Лотинӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="817"/>
         <source>Vietnamese (French)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ветнамӣ (Франсузӣ)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="818"/>
         <source>Vietnamese (US)</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ветнамӣ (ИМА)</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="819"/>
         <source>Yakut</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Ёқутӣ</translation>
     </message>
     <message>
         <location filename="../src/modules/keyboard/KeyboardData_p.cxxtr" line="820"/>
         <source>Yoruba</source>
         <comment>kb_variants</comment>
-        <translation type="unfinished"></translation>
+        <translation>Йоруба</translation>
     </message>
 </context>
 </TS>

From 59255c7a577c55a952c4a97517d4c3c1ab334b59 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 5 Nov 2020 00:00:29 +0100
Subject: [PATCH 198/228] Changes: apply coding style

---
 src/libcalamares/geoip/test_geoip.cpp              |  2 +-
 src/libcalamares/modulesystem/Module.cpp           |  3 ++-
 src/libcalamares/utils/Retranslator.cpp            |  4 ++--
 src/modules/partition/core/PartitionActions.cpp    |  2 +-
 src/modules/partition/tests/CreateLayoutsTests.cpp | 13 +++++++------
 src/modules/users/TestGroupInformation.cpp         |  6 +++---
 6 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/libcalamares/geoip/test_geoip.cpp b/src/libcalamares/geoip/test_geoip.cpp
index fd50cecff..0e14dcf91 100644
--- a/src/libcalamares/geoip/test_geoip.cpp
+++ b/src/libcalamares/geoip/test_geoip.cpp
@@ -37,7 +37,7 @@ main( int argc, char** argv )
     QString format( argv[ 1 ] );
     QString selector = argc == 3 ? QString( argv[ 2 ] ) : QString();
 
-    Logger::setupLogLevel(Logger::LOGVERBOSE);
+    Logger::setupLogLevel( Logger::LOGVERBOSE );
     cDebug() << "Doing GeoIP interpretation with format=" << format << "selector=" << selector;
 
     Interface* handler = nullptr;
diff --git a/src/libcalamares/modulesystem/Module.cpp b/src/libcalamares/modulesystem/Module.cpp
index 94888f240..ff0b20f78 100644
--- a/src/libcalamares/modulesystem/Module.cpp
+++ b/src/libcalamares/modulesystem/Module.cpp
@@ -86,7 +86,8 @@ moduleConfigurationCandidates( bool assumeBuildDir, const QString& moduleName, c
     return paths;
 }
 
-void Module::loadConfigurationFile( const QString& configFileName )  //throws YAML::Exception
+void
+Module::loadConfigurationFile( const QString& configFileName )  //throws YAML::Exception
 {
     QStringList configCandidates
         = moduleConfigurationCandidates( Settings::instance()->debugMode(), name(), configFileName );
diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index 7781ecf51..41d5966ab 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -195,7 +195,7 @@ installTranslator( const QLocale& locale, const QString& brandingTranslationsPre
     loadSingletonTranslator( TZLoader( locale ), s_tztranslator );
     loadSingletonTranslator( CalamaresLoader( locale ), s_translator );
 
-    s_translatorLocaleName = CalamaresLoader::mungeLocaleName(locale);
+    s_translatorLocaleName = CalamaresLoader::mungeLocaleName( locale );
 }
 
 
@@ -206,7 +206,7 @@ translatorLocaleName()
 }
 
 bool
-loadTranslator( const QLocale& locale, const QString& prefix, QTranslator *translator )
+loadTranslator( const QLocale& locale, const QString& prefix, QTranslator* translator )
 {
     return ::tryLoad( translator, prefix, locale.name() );
 }
diff --git a/src/modules/partition/core/PartitionActions.cpp b/src/modules/partition/core/PartitionActions.cpp
index 5d92d9b92..dc3b0b572 100644
--- a/src/modules/partition/core/PartitionActions.cpp
+++ b/src/modules/partition/core/PartitionActions.cpp
@@ -196,7 +196,7 @@ doAutopartition( PartitionCoreModule* core, Device* dev, Choices::AutoPartitionO
                                                                      KPM_PARTITION_FLAG( None ) );
         }
         PartitionInfo::setFormat( swapPartition, true );
-        if ( gs->contains( "swapPartitionName" ))
+        if ( gs->contains( "swapPartitionName" ) )
         {
             swapPartition->setLabel( gs->value( "swapPartitionName" ).toString() );
         }
diff --git a/src/modules/partition/tests/CreateLayoutsTests.cpp b/src/modules/partition/tests/CreateLayoutsTests.cpp
index 04a06b2b3..216bfc209 100644
--- a/src/modules/partition/tests/CreateLayoutsTests.cpp
+++ b/src/modules/partition/tests/CreateLayoutsTests.cpp
@@ -64,7 +64,8 @@ CreateLayoutsTests::testFixedSizePartition()
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
 
-    partitions = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
+    partitions
+        = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
 
     QCOMPARE( partitions.count(), 1 );
 
@@ -84,7 +85,8 @@ CreateLayoutsTests::testPercentSizePartition()
         QFAIL( qPrintable( "Unable to create / partition" ) );
     }
 
-    partitions = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
+    partitions
+        = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
 
     QCOMPARE( partitions.count(), 1 );
 
@@ -114,7 +116,8 @@ CreateLayoutsTests::testMixedSizePartition()
         QFAIL( qPrintable( "Unable to create /bkup partition" ) );
     }
 
-    partitions = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
+    partitions
+        = layout.createPartitions( static_cast< Device* >( &dev ), 0, dev.totalLogical(), nullptr, nullptr, role );
 
     QCOMPARE( partitions.count(), 3 );
 
@@ -155,6 +158,4 @@ TestDevice::TestDevice( const QString& name, const qint64 logicalSectorSize, con
 }
 #endif
 
-TestDevice::~TestDevice()
-{
-}
+TestDevice::~TestDevice() {}
diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp
index dd4bfe78f..9fc1e1c35 100644
--- a/src/modules/users/TestGroupInformation.cpp
+++ b/src/modules/users/TestGroupInformation.cpp
@@ -73,7 +73,8 @@ GroupTests::testReadGroup()
     }
 }
 
-void GroupTests::testCreateGroup()
+void
+GroupTests::testCreateGroup()
 {
     // BUILD_AS_TEST is the source-directory path
     QFile fi( QString( "%1/tests/5-issue-1523.conf" ).arg( BUILD_AS_TEST ) );
@@ -93,12 +94,11 @@ void GroupTests::testCreateGroup()
 
     Calamares::JobQueue::instance()->globalStorage()->insert( "rootMountPoint", "/" );
 
-    SetupGroupsJob j(&c);
+    SetupGroupsJob j( &c );
     QVERIFY( !j.exec() );  // running as regular user this should fail
 }
 
 
-
 QTEST_GUILESS_MAIN( GroupTests )
 
 #include "utils/moc-warnings.h"

From 83b2b9538184d3299cbd13015e24304beed15a8e Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 5 Nov 2020 00:09:23 +0100
Subject: [PATCH 199/228] [libcalamares] Reduce object churn

- we don't need to allocate a new translator each time the language changes
---
 src/libcalamares/utils/Retranslator.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libcalamares/utils/Retranslator.cpp b/src/libcalamares/utils/Retranslator.cpp
index 41d5966ab..46bafab85 100644
--- a/src/libcalamares/utils/Retranslator.cpp
+++ b/src/libcalamares/utils/Retranslator.cpp
@@ -168,17 +168,17 @@ TZLoader::tryLoad( QTranslator* translator )
 static void
 loadSingletonTranslator( TranslationLoader&& loader, QTranslator*& translator_p )
 {
-    QTranslator* translator = new QTranslator();
-    loader.tryLoad( translator );
-
-    if ( translator_p )
+    if ( !translator_p )
     {
-        QCoreApplication::removeTranslator( translator_p );
-        delete translator_p;
+        QTranslator* translator = new QTranslator();
+        loader.tryLoad( translator );
+        QCoreApplication::installTranslator( translator );
+        translator_p = translator;
+    }
+    else
+    {
+        loader.tryLoad( translator_p );
     }
-
-    QCoreApplication::installTranslator( translator );
-    translator_p = translator;
 }
 
 namespace CalamaresUtils

From e5b7e66ee94b065f513c71b75e47d85b2179ee5b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 5 Nov 2020 00:33:45 +0100
Subject: [PATCH 200/228] [locale] Filter zones combo always

The drop-down of zones was initially unfiltered, so you could start
in Europe/Amsterdam and the zones drop-down would also show Australian
zones; picking Perth would have weird effects, since Europe/Perth
doesn't exist and so you'd end up in New York instead.

- set the filtering region immediately, rather than only when the
  region changes.
---
 src/modules/locale/LocalePage.cpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/modules/locale/LocalePage.cpp b/src/modules/locale/LocalePage.cpp
index 7a6ed8b15..e296b790b 100644
--- a/src/modules/locale/LocalePage.cpp
+++ b/src/modules/locale/LocalePage.cpp
@@ -91,10 +91,16 @@ LocalePage::LocalePage( Config* config, QWidget* parent )
 
     // Set up the location before connecting signals, to avoid a signal
     // storm as various parts interact.
-    m_regionCombo->setModel( m_config->regionModel() );
-    m_zoneCombo->setModel( m_config->regionalZonesModel() );
-    locationChanged( m_config->currentLocation() );  // doesn't inform TZ widget
-    m_tzWidget->setCurrentLocation( m_config->currentLocation() );
+    {
+        auto* regions = m_config->regionModel();
+        auto* zones = m_config->regionalZonesModel();
+        auto* location = m_config->currentLocation();
+        zones->setRegion( location->region() );
+        m_regionCombo->setModel( regions );
+        m_zoneCombo->setModel( zones );
+        m_tzWidget->setCurrentLocation( location );
+        locationChanged( location );  // doesn't inform TZ widget
+    }
 
     connect( config, &Config::currentLCStatusChanged, m_formatsLabel, &QLabel::setText );
     connect( config, &Config::currentLanguageStatusChanged, m_localeLabel, &QLabel::setText );

From afb4e00f92953a140e55c5eb5e76ebbea84e2f59 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 6 Nov 2020 01:10:27 +0100
Subject: [PATCH 201/228] [keyboard] Pre-select pc105

---
 src/modules/keyboard/KeyboardLayoutModel.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index abac1cdc2..8b5906699 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -137,6 +137,7 @@ KeyboardModelsModel::KeyboardModelsModel( QObject* parent )
     }
 
     cDebug() << "Loaded" << m_list.count() << "keyboard models";
+    setCurrentIndex();  // If pc105 was seen, select it now
 }
 
 

From 822e30c89486731c262108bcc07d9923587d902d Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Fri, 6 Nov 2020 01:14:28 +0100
Subject: [PATCH 202/228] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_bn.ts    |  6 +++---
 lang/calamares_es.ts    |  6 +++---
 lang/calamares_es_MX.ts | 18 +++++++++---------
 lang/calamares_hr.ts    |  4 ++--
 lang/calamares_nl.ts    |  2 +-
 lang/calamares_pt_BR.ts |  2 +-
 lang/calamares_sk.ts    |  4 ++--
 lang/calamares_te.ts    |  4 ++--
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lang/calamares_bn.ts b/lang/calamares_bn.ts
index 6887bdf28..06b696140 100644
--- a/lang/calamares_bn.ts
+++ b/lang/calamares_bn.ts
@@ -3337,7 +3337,7 @@ Output:
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="40"/>
       <source>Set password for user %1</source>
-      <translation>ব্যবহারকারীর জন্য গুপ্ত-সংকেত নির্ধারণ করুন % 1</translation>
+      <translation>ব্যবহারকারীর জন্য গুপ্ত-সংকেত নির্ধারণ করুন %1</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="47"/>
@@ -3352,7 +3352,7 @@ Output:
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="82"/>
       <source>rootMountPoint is %1</source>
-      <translation>রুটমাউন্টপয়েন্টটি % 1</translation>
+      <translation>রুটমাউন্টপয়েন্টটি %1</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="88"/>
@@ -3367,7 +3367,7 @@ Output:
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="97"/>
       <source>Cannot set password for user %1.</source>
-      <translation>% 1 ব্যবহারকারীর জন্য পাসওয়ার্ড নির্ধারণ করা যাচ্ছে না।</translation>
+      <translation>%1 ব্যবহারকারীর জন্য পাসওয়ার্ড নির্ধারণ করা যাচ্ছে না।</translation>
     </message>
     <message>
       <location filename="../src/modules/users/SetPasswordJob.cpp" line="98"/>
diff --git a/lang/calamares_es.ts b/lang/calamares_es.ts
index c579cd752..b4104670d 100644
--- a/lang/calamares_es.ts
+++ b/lang/calamares_es.ts
@@ -162,12 +162,12 @@ Para configurar el arranque desde un entorno BIOS, este instalador debe instalar
     <message>
       <location filename="../src/libcalamares/ProcessJob.cpp" line="43"/>
       <source>Run command '%1' in target system.</source>
-      <translation>Ejecutar el comando '% 1' en el sistema de destino.</translation>
+      <translation>Ejecutar el comando '%1' en el sistema de destino.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/ProcessJob.cpp" line="43"/>
       <source> Run command '%1'.</source>
-      <translation>Ejecutar el comando '% 1'.</translation>
+      <translation>Ejecutar el comando '%1'.</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/ProcessJob.cpp" line="50"/>
@@ -1120,7 +1120,7 @@ Saldrá del instalador y se perderán todos los cambios.</translation>
     <message>
       <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="97"/>
       <source>This device has a &lt;strong&gt;%1&lt;/strong&gt; partition table.</source>
-      <translation>Este dispositivo tiene un &lt;strong&gt;% 1 &lt;/ strong&gt; tabla de particiones.</translation>
+      <translation>Este dispositivo tiene un &lt;strong&gt;%1&lt;/strong&gt; tabla de particiones.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/DeviceInfoWidget.cpp" line="104"/>
diff --git a/lang/calamares_es_MX.ts b/lang/calamares_es_MX.ts
index 00c1c2188..9e9e17b94 100644
--- a/lang/calamares_es_MX.ts
+++ b/lang/calamares_es_MX.ts
@@ -1080,17 +1080,17 @@ El instalador terminará y se perderán todos los cambios.</translation>
       <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="24"/>
       <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="36"/>
       <source>Deactivate volume group named %1.</source>
-      <translation>Desactivar el grupo de volúmenes llamado%1.</translation>
+      <translation>Desactivar el grupo de volúmenes llamado %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="30"/>
       <source>Deactivate volume group named &lt;strong&gt;%1&lt;/strong&gt;.</source>
-      <translation>Desactivar el grupo de volúmenes llamado&lt;strong&gt;% 1&lt;/strong&gt;.</translation>
+      <translation>Desactivar el grupo de volúmenes llamado&lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/DeactivateVolumeGroupJob.cpp" line="48"/>
       <source>The installer failed to deactivate a volume group named %1.</source>
-      <translation>El instalador no pudo desactivar un grupo de volúmenes llamado%1.</translation>
+      <translation>El instalador no pudo desactivar un grupo de volúmenes llamado %1.</translation>
     </message>
   </context>
   <context>
@@ -1330,7 +1330,7 @@ El instalador terminará y se perderán todos los cambios.</translation>
     <message>
       <location filename="../src/modules/finished/FinishedPage.cpp" line="44"/>
       <source>&lt;h1&gt;All done.&lt;/h1&gt;&lt;br/&gt;%1 has been set up on your computer.&lt;br/&gt;You may now start using your new system.</source>
-      <translation>&lt;h1&gt;Todo listo.&lt;/h1&gt;&lt;br/&gt;% 1 se ha configurado en su computadora. &lt;br/&gt;Ahora puede comenzar a usar su nuevo sistema.</translation>
+      <translation>&lt;h1&gt;Todo listo.&lt;/h1&gt;&lt;br/&gt;%1 se ha configurado en su computadora. &lt;br/&gt;Ahora puede comenzar a usar su nuevo sistema.</translation>
     </message>
     <message>
       <location filename="../src/modules/finished/FinishedPage.cpp" line="48"/>
@@ -2198,7 +2198,7 @@ El instalador terminará y se perderán todos los cambios.</translation>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="278"/>
       <source>Setting %1 is not of integer type</source>
-      <translation>Ajuste de % 1 no es de tipo entero</translation>
+      <translation>Ajuste de %1 no es de tipo entero</translation>
     </message>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="283"/>
@@ -3260,7 +3260,7 @@ Salida
     <message>
       <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="43"/>
       <source>Set flags on partition %1.</source>
-      <translation>Establecer indicadores en la partición% 1.</translation>
+      <translation>Establecer indicadores en la partición %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="49"/>
@@ -3335,7 +3335,7 @@ Salida
     <message>
       <location filename="../src/modules/partition/jobs/SetPartitionFlagsJob.cpp" line="156"/>
       <source>The installer failed to set flags on partition %1.</source>
-      <translation>El instalador no pudo establecer indicadores en la partición% 1.</translation>
+      <translation>El instalador no pudo establecer indicadores en la partición %1.</translation>
     </message>
   </context>
   <context>
@@ -3530,12 +3530,12 @@ Salida
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="101"/>
       <source>Could not configure machine feedback correctly, script error %1.</source>
-      <translation>No se pudo configurar correctamente la retroalimentación de la máquina, error de script% 1.</translation>
+      <translation>No se pudo configurar correctamente la retroalimentación de la máquina, error de script %1.</translation>
     </message>
     <message>
       <location filename="../src/modules/tracking/TrackingJobs.cpp" line="107"/>
       <source>Could not configure machine feedback correctly, Calamares error %1.</source>
-      <translation>No se pudo configurar la retroalimentación de la máquina correctamente, Calamares error% 1.</translation>
+      <translation>No se pudo configurar la retroalimentación de la máquina correctamente, Calamares error %1.</translation>
     </message>
   </context>
   <context>
diff --git a/lang/calamares_hr.ts b/lang/calamares_hr.ts
index 256de9da6..eae13403d 100644
--- a/lang/calamares_hr.ts
+++ b/lang/calamares_hr.ts
@@ -3067,12 +3067,12 @@ Postavljanje se može nastaviti, ali neke će značajke možda biti onemogućene
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="186"/>
       <source>The filesystem %1 could not be found in this system, and cannot be resized.</source>
-      <translation>Datotečni sustav % 1 nije moguće pronaći na ovom sustavu i ne može mu se promijeniti veličina.</translation>
+      <translation>Datotečni sustav %1 nije moguće pronaći na ovom sustavu i ne može mu se promijeniti veličina.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="187"/>
       <source>The device %1 could not be found in this system, and cannot be resized.</source>
-      <translation>Uređaj % 1 nije moguće pronaći na ovom sustavu i ne može mu se promijeniti veličina.</translation>
+      <translation>Uređaj %1 nije moguće pronaći na ovom sustavu i ne može mu se promijeniti veličina.</translation>
     </message>
     <message>
       <location filename="../src/modules/fsresizer/ResizeFSJob.cpp" line="195"/>
diff --git a/lang/calamares_nl.ts b/lang/calamares_nl.ts
index f9276e02e..370ddf890 100644
--- a/lang/calamares_nl.ts
+++ b/lang/calamares_nl.ts
@@ -3012,7 +3012,7 @@ Uitvoer:
       <location filename="../src/modules/welcomeq/Requirements.qml" line="38"/>
       <source>&lt;p&gt;This computer does not satisfy the minimum requirements for installing %1.&lt;br/&gt;
         Installation cannot continue.&lt;/p&gt;</source>
-      <translation>Deze computer voldoet niet aan de minimale vereisten voor het installeren van % 1.
+      <translation>Deze computer voldoet niet aan de minimale vereisten voor het installeren van %1.
 De installatie kan niet doorgaan.</translation>
     </message>
     <message>
diff --git a/lang/calamares_pt_BR.ts b/lang/calamares_pt_BR.ts
index 9897c6c1a..438a0a47e 100644
--- a/lang/calamares_pt_BR.ts
+++ b/lang/calamares_pt_BR.ts
@@ -2015,7 +2015,7 @@ O instalador será fechado e todas as alterações serão perdidas.</translation
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="151"/>
       <source>Memory allocation error when setting '%1'</source>
-      <translation>Erro de alocação de memória ao definir '% 1'</translation>
+      <translation>Erro de alocação de memória ao definir '%1'</translation>
     </message>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="156"/>
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index eaef4dad4..ca894a8c4 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -2127,7 +2127,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/>
       <source>The password contains more than %1 same characters consecutively</source>
-      <translation>Heslo obsahuje viac ako% 1 rovnakých znakov za sebou</translation>
+      <translation>Heslo obsahuje viac ako %1 rovnakých znakov za sebou</translation>
     </message>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="224"/>
@@ -2137,7 +2137,7 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="228"/>
       <source>The password contains more than %1 characters of the same class consecutively</source>
-      <translation>Heslo obsahuje postupne viac ako% 1 znakov toho istého typu</translation>
+      <translation>Heslo obsahuje postupne viac ako %1 znakov toho istého typu</translation>
     </message>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="232"/>
diff --git a/lang/calamares_te.ts b/lang/calamares_te.ts
index 4786aafd0..3201f80b6 100644
--- a/lang/calamares_te.ts
+++ b/lang/calamares_te.ts
@@ -25,7 +25,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి
     <message>
       <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="58"/>
       <source>Master Boot Record of %1</source>
-      <translation>% 1 యొక్క మాస్టర్ బూట్ రికార్డ్</translation>
+      <translation>%1 యొక్క మాస్టర్ బూట్ రికార్డ్</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/core/BootLoaderModel.cpp" line="91"/>
@@ -134,7 +134,7 @@ automatic ఉంటుంది, మీరు మాన్యువల్ వి
     <message>
       <location filename="../src/libcalamares/JobExample.cpp" line="29"/>
       <source>Job failed (%1)</source>
-      <translation>జాబ్ విఫలమైంది (% 1)</translation>
+      <translation>జాబ్ విఫలమైంది (%1)</translation>
     </message>
     <message>
       <location filename="../src/libcalamares/JobExample.cpp" line="30"/>

From 6e9ce7194f47abd8c27cb61cdad5a0b828ea174d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Fri, 6 Nov 2020 05:56:29 -0500
Subject: [PATCH 203/228] [mount] Ignore unformatted filesystems only

Mount guesses the filesystem if it is unset or if it is set to auto,
thanks to blkid. That is the case for the bind mountpoints like /dev or
/run/udev in mount.conf. See `mount(8)` for more details.
---
 src/modules/mount/main.py    | 2 +-
 src/modules/mount/mount.conf | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/modules/mount/main.py b/src/modules/mount/main.py
index 71599a6de..1313fca49 100644
--- a/src/modules/mount/main.py
+++ b/src/modules/mount/main.py
@@ -56,7 +56,7 @@ def mount_partition(root_mount_point, partition, partitions):
         raise
 
     fstype = partition.get("fs", "").lower()
-    if not fstype or fstype == "unformatted":
+    if fstype == "unformatted":
         return
 
     if fstype == "fat16" or fstype == "fat32":
diff --git a/src/modules/mount/mount.conf b/src/modules/mount/mount.conf
index 1e70465c2..3a117d32c 100644
--- a/src/modules/mount/mount.conf
+++ b/src/modules/mount/mount.conf
@@ -12,10 +12,13 @@
 # Extra filesystems to mount. The key's value is a list of entries; each
 # entry has four keys:
 #   - device    The device node to mount
-#   - fs        The filesystem type to use
+#   - fs (optional) The filesystem type to use
 #   - mountPoint Where to mount the filesystem
 #   - options (optional) Extra options to pass to mount(8)
 #
+# The device is not mounted if the mountPoint is unset or if the fs is
+# set to unformatted.
+#
 extraMounts:
     - device: proc
       fs: proc

From 6f41949bba9db4d0e48bba6a2aa3be341e8289c8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 6 Nov 2020 14:38:12 +0100
Subject: [PATCH 204/228] [users] Log when sudo is skipped

---
 src/modules/users/MiscJobs.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/modules/users/MiscJobs.cpp b/src/modules/users/MiscJobs.cpp
index a62ada6d7..c1c1d5d25 100644
--- a/src/modules/users/MiscJobs.cpp
+++ b/src/modules/users/MiscJobs.cpp
@@ -38,6 +38,7 @@ SetupSudoJob::exec()
 {
     if ( m_sudoGroup.isEmpty() )
     {
+        cDebug() << "Skipping sudo 10-installer because the sudoGroup is empty.";
         return Calamares::JobResult::ok();
     }
 

From 8e53b83f9f156f0d427e5672f1ad0c38607799c2 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 6 Nov 2020 22:27:34 +0100
Subject: [PATCH 205/228] [users] Test for setting / resetting sudo settings

---
 src/modules/users/TestGroupInformation.cpp | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp
index 9fc1e1c35..9efb6f72f 100644
--- a/src/modules/users/TestGroupInformation.cpp
+++ b/src/modules/users/TestGroupInformation.cpp
@@ -34,6 +34,8 @@ private Q_SLOTS:
 
     void testReadGroup();
     void testCreateGroup();
+
+    void testSudoGroup();
 };
 
 GroupTests::GroupTests() {}
@@ -98,6 +100,47 @@ GroupTests::testCreateGroup()
     QVERIFY( !j.exec() );  // running as regular user this should fail
 }
 
+void GroupTests::testSudoGroup()
+{
+    // Test programmatic changes
+    {
+        Config c;
+        QSignalSpy spy(&c, &Config::sudoersGroupChanged);
+        QCOMPARE( c.sudoersGroup(), QString() );
+        c.setSudoersGroup( QStringLiteral( "wheel" ) );
+        QCOMPARE( c.sudoersGroup(), QStringLiteral( "wheel" ) );
+        QCOMPARE( spy.count(), 1);  // Changed to wheel
+        // Do it again, no change
+        c.setSudoersGroup( QStringLiteral( "wheel" ) );
+        QCOMPARE( c.sudoersGroup(), QStringLiteral( "wheel" ) );
+        QCOMPARE( spy.count(), 1);
+        c.setSudoersGroup( QStringLiteral( "roue" ) );
+        QCOMPARE( c.sudoersGroup(), QStringLiteral( "roue" ) );
+        QCOMPARE( spy.count(), 2);
+    }
+
+
+    // Test config loading
+    {
+        Config c;
+        QSignalSpy spy(&c, &Config::sudoersGroupChanged);
+        QCOMPARE( c.sudoersGroup(), QString() );
+
+        QVariantMap m;
+        c.setConfigurationMap( m );
+        QCOMPARE( c.sudoersGroup(), QString() );
+        QCOMPARE( spy.count(), 0);  // Unchanged
+
+        const auto key = QStringLiteral( "sudoersGroup" );
+        const auto v0 = QStringLiteral( "wheel" );
+        const auto v1 = QStringLiteral( "roue" );
+        m.insert( key, v0 );
+        c.setConfigurationMap( m );
+        QCOMPARE( c.sudoersGroup(), v0 );
+        QCOMPARE( spy.count(), 1);
+    }
+}
+
 
 QTEST_GUILESS_MAIN( GroupTests )
 

From 43e271dfec6fc11fdd52b0c5de97f17ddbe98070 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Fri, 6 Nov 2020 22:27:46 +0100
Subject: [PATCH 206/228] [users] Missing negation

---
 src/modules/users/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 0e70cc215..77f52b466 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -815,7 +815,7 @@ Config::createJobs() const
 
     Calamares::Job* j;
 
-    if ( m_sudoersGroup.isEmpty() )
+    if ( !m_sudoersGroup.isEmpty() )
     {
         j = new SetupSudoJob( m_sudoersGroup );
         jobs.append( Calamares::job_ptr( j ) );

From 2a9bbf1dd5f7f0aedf9af4fe91b7036a81a0675f Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Nov 2020 11:38:38 +0100
Subject: [PATCH 207/228] [users] Add test for jobs-creation

- This tries to avoid the now-fixed situation where a sudoersGroup job
  is not created at all (because of a logic error).
- While here, coding style
---
 src/modules/users/TestGroupInformation.cpp | 47 ++++++++++++++++++----
 1 file changed, 39 insertions(+), 8 deletions(-)

diff --git a/src/modules/users/TestGroupInformation.cpp b/src/modules/users/TestGroupInformation.cpp
index 9efb6f72f..21b8d47ce 100644
--- a/src/modules/users/TestGroupInformation.cpp
+++ b/src/modules/users/TestGroupInformation.cpp
@@ -36,6 +36,7 @@ private Q_SLOTS:
     void testCreateGroup();
 
     void testSudoGroup();
+    void testJobCreation();
 };
 
 GroupTests::GroupTests() {}
@@ -100,36 +101,37 @@ GroupTests::testCreateGroup()
     QVERIFY( !j.exec() );  // running as regular user this should fail
 }
 
-void GroupTests::testSudoGroup()
+void
+GroupTests::testSudoGroup()
 {
     // Test programmatic changes
     {
         Config c;
-        QSignalSpy spy(&c, &Config::sudoersGroupChanged);
+        QSignalSpy spy( &c, &Config::sudoersGroupChanged );
         QCOMPARE( c.sudoersGroup(), QString() );
         c.setSudoersGroup( QStringLiteral( "wheel" ) );
         QCOMPARE( c.sudoersGroup(), QStringLiteral( "wheel" ) );
-        QCOMPARE( spy.count(), 1);  // Changed to wheel
+        QCOMPARE( spy.count(), 1 );  // Changed to wheel
         // Do it again, no change
         c.setSudoersGroup( QStringLiteral( "wheel" ) );
         QCOMPARE( c.sudoersGroup(), QStringLiteral( "wheel" ) );
-        QCOMPARE( spy.count(), 1);
+        QCOMPARE( spy.count(), 1 );
         c.setSudoersGroup( QStringLiteral( "roue" ) );
         QCOMPARE( c.sudoersGroup(), QStringLiteral( "roue" ) );
-        QCOMPARE( spy.count(), 2);
+        QCOMPARE( spy.count(), 2 );
     }
 
 
     // Test config loading
     {
         Config c;
-        QSignalSpy spy(&c, &Config::sudoersGroupChanged);
+        QSignalSpy spy( &c, &Config::sudoersGroupChanged );
         QCOMPARE( c.sudoersGroup(), QString() );
 
         QVariantMap m;
         c.setConfigurationMap( m );
         QCOMPARE( c.sudoersGroup(), QString() );
-        QCOMPARE( spy.count(), 0);  // Unchanged
+        QCOMPARE( spy.count(), 0 );  // Unchanged
 
         const auto key = QStringLiteral( "sudoersGroup" );
         const auto v0 = QStringLiteral( "wheel" );
@@ -137,10 +139,39 @@ void GroupTests::testSudoGroup()
         m.insert( key, v0 );
         c.setConfigurationMap( m );
         QCOMPARE( c.sudoersGroup(), v0 );
-        QCOMPARE( spy.count(), 1);
+        QCOMPARE( spy.count(), 1 );
     }
 }
 
+/** @brief Are all the expected jobs (and no others) created?
+ *
+ * - A sudo job is created only when the sudoers group is set;
+ * - Groups job
+ * - User job
+ * - Password job
+ * - Root password job
+ * - Hostname job are always created.
+ */
+void
+GroupTests::testJobCreation()
+{
+    const int expectedJobs = 5;
+    Config c;
+    QVERIFY( !c.isReady() );
+
+    // Needs some setup
+    c.setFullName( QStringLiteral( "Goodluck Jonathan" ) );
+    c.setLoginName( QStringLiteral( "goodj" ) );
+    QVERIFY( c.isReady() );
+
+    QCOMPARE( c.sudoersGroup(), QString() );
+    QCOMPARE( c.createJobs().count(), expectedJobs );
+
+    c.setSudoersGroup( QStringLiteral( "wheel" ) );
+    QCOMPARE( c.sudoersGroup(), QString( "wheel" ) );
+    QCOMPARE( c.createJobs().count(), expectedJobs + 1 );
+}
+
 
 QTEST_GUILESS_MAIN( GroupTests )
 

From 225a5d31c21be382772e72854718cc2f61c2635b Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Nov 2020 11:39:38 +0100
Subject: [PATCH 208/228] Changes: pre-release housekeeping

---
 CHANGES | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index 564c5fd0c..1083f4ad2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,7 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
-# 3.2.33 (2020-11-03) #
+# 3.2.33 (2020-11-09) #
 
 This release contains contributions from (alphabetically by first name):
  - Anke Boersma

From d93090de4416a934e0671dbca25953fc8f33537f Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Mon, 9 Nov 2020 12:27:04 +0100
Subject: [PATCH 209/228] i18n: [calamares] Automatic merge of Transifex
 translations

---
 lang/calamares_de.ts |  8 ++++----
 lang/calamares_sk.ts | 20 +++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/lang/calamares_de.ts b/lang/calamares_de.ts
index 6a972aca8..8e8e458c1 100644
--- a/lang/calamares_de.ts
+++ b/lang/calamares_de.ts
@@ -619,17 +619,17 @@ Dies wird das Installationsprogramm beenden und alle Änderungen gehen verloren.
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Auf diesem Speichergerät befindet sich bereits ein Betriebssystem, aber die Partitionstabelle &lt;strong&gt;%1&lt;/strong&gt; unterscheidet sich von den erforderlichen &lt;strong&gt;%2&lt;/strong&gt;&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Bei diesem Speichergerät ist eine seiner Partitionen &lt;strong&gt;eingehängt&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Dieses Speichergerät ist ein Teil eines &lt;strong&gt;inaktiven RAID&lt;/strong&gt;-Geräts.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
@@ -2868,7 +2868,7 @@ Ausgabe:
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
       <source>Directory not found</source>
-      <translation type="unfinished"/>
+      <translation>Verzeichnis nicht gefunden</translation>
     </message>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
diff --git a/lang/calamares_sk.ts b/lang/calamares_sk.ts
index ca894a8c4..6ddd9d534 100644
--- a/lang/calamares_sk.ts
+++ b/lang/calamares_sk.ts
@@ -623,17 +623,18 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
-      <translation type="unfinished"/>
+      <translation>Toto úložné zariadenie už obsahuje operačný systém, ale tabuľka oddielov &lt;strong&gt;%1&lt;/strong&gt; sa líši od požadovanej &lt;strong&gt;%2&lt;/strong&gt;.
+&lt;br/&gt;</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
-      <translation type="unfinished"/>
+      <translation>Toto úložné zariadenie má jeden zo svojich oddielov &lt;strong&gt;pripojený&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
-      <translation type="unfinished"/>
+      <translation>Toto úložné zariadenie je súčasťou zariadenia s &lt;strong&gt;neaktívnym RAIDom&lt;/strong&gt;.</translation>
     </message>
     <message>
       <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
@@ -1826,7 +1827,8 @@ Inštalátor sa ukončí a všetky zmeny budú stratené.</translation>
       <source>Please select your preferred location on the map so the installer can suggest the locale
             and timezone settings for you. You can fine-tune the suggested settings below. Search the map by dragging
             to move and using the +/- buttons to zoom in/out or use mouse scrolling for zooming.</source>
-      <translation type="unfinished"/>
+      <translation>Prosím, vyberte vaše preferované umiestnenie, aby mohol inštalátor pre vás navrhnúť
+            miestne nastavenia a časovú zónu. Navrhnuté nastavenia môžete doladiť nižšie. Mapu môžete presúvať ťahaním a približovať alebo odďaľovať tlačidlami +/- alebo rolovaním myšou.</translation>
     </message>
   </context>
   <context>
@@ -2870,7 +2872,7 @@ Výstup:
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="83"/>
       <source>Directory not found</source>
-      <translation type="unfinished"/>
+      <translation>Adresár sa nenašiel</translation>
     </message>
     <message>
       <location filename="../src/modules/machineid/MachineIdJob.cpp" line="84"/>
@@ -3873,7 +3875,7 @@ Výstup:
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="60"/>
       <source>Click your preferred keyboard model to select layout and variant, or use the default one based on the detected hardware.</source>
-      <translation type="unfinished"/>
+      <translation>Kliknutím na preferovaný model klávesnice vyberiete rozloženie, alebo použite predvolený, ktorý bol vybraný podľa rozpoznaného hardvéru.</translation>
     </message>
     <message>
       <location filename="../src/modules/keyboardq/keyboardq.qml" line="253"/>
@@ -4012,12 +4014,12 @@ Výstup:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="204"/>
       <source>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.</source>
-      <translation type="unfinished"/>
+      <translation>Zadajte rovnaké heslo dvakrát, aby sa predišlo preklepom. Dobré heslo by malo obsahovať mix písmen, čísel a diakritiky, malo by mať dĺžku aspoň osem znakov a malo by byť pravidelne menené.</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="216"/>
       <source>Validate passwords quality</source>
-      <translation type="unfinished"/>
+      <translation>Overiť kvalitu hesiel</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="226"/>
@@ -4032,7 +4034,7 @@ Výstup:
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="243"/>
       <source>Reuse user password as root password</source>
-      <translation type="unfinished"/>
+      <translation>Znovu použiť používateľské heslo ako heslo správcu</translation>
     </message>
     <message>
       <location filename="../src/modules/usersq/usersq.qml" line="253"/>

From e888f7b90e24535c414de3dbb474709fc98781fa Mon Sep 17 00:00:00 2001
From: Calamares CI <groot@kde.org>
Date: Mon, 9 Nov 2020 12:27:05 +0100
Subject: [PATCH 210/228] i18n: [python] Automatic merge of Transifex
 translations

---
 lang/python/de/LC_MESSAGES/python.po | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lang/python/de/LC_MESSAGES/python.po b/lang/python/de/LC_MESSAGES/python.po
index e67f06089..6dd5b751d 100644
--- a/lang/python/de/LC_MESSAGES/python.po
+++ b/lang/python/de/LC_MESSAGES/python.po
@@ -4,9 +4,9 @@
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 # 
 # Translators:
-# Andreas Eitel <github-aneitel@online.de>, 2020
 # Adriaan de Groot <groot@kde.org>, 2020
 # Christian Spaan, 2020
+# Andreas Eitel <github-aneitel@online.de>, 2020
 # 
 #, fuzzy
 msgid ""
@@ -15,7 +15,7 @@ msgstr ""
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-10-16 22:35+0200\n"
 "PO-Revision-Date: 2017-08-09 10:34+0000\n"
-"Last-Translator: Christian Spaan, 2020\n"
+"Last-Translator: Andreas Eitel <github-aneitel@online.de>, 2020\n"
 "Language-Team: German (https://www.transifex.com/calamares/teams/20061/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -208,6 +208,8 @@ msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
+"Die Liste der Displaymanager ist leer oder weder in globalstorage noch in "
+"displaymanager.conf definiert."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"

From d336d0167f41c15b953f7d33280663367f76e4f5 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Nov 2020 13:08:07 +0100
Subject: [PATCH 211/228] i18n: translation stats

(This does not change the overall list of available languages)
---
 CMakeLists.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8744afb4..96bd0a9ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,10 +141,10 @@ set( CALAMARES_DESCRIPTION_SUMMARY
 #       `txstats.py -e`. See also
 #
 # Total 71 languages
-set( _tx_complete be ca cs_CZ da fi_FI fur he hi hr ja pt_BR sq sv
-    tg uk vi zh_TW )
-set( _tx_good as ast az az_AZ de es fa fr hu it_IT ko lt ml nl
-    pt_PT ru sk tr_TR zh_CN )
+set( _tx_complete az az_AZ be ca cs_CZ da de fi_FI fur he hi hr ja
+    pt_BR sq sv tg uk vi zh_TW )
+set( _tx_good as ast es fa fr hu it_IT ko lt ml nl pt_PT ru sk
+    tr_TR zh_CN )
 set( _tx_ok ar bg bn el en_GB es_MX es_PR et eu gl id is mr nb pl
     ro sl sr sr@latin th )
 set( _tx_incomplete ca@valencia eo fr_CH gu ie kk kn lo lv mk ne_NP

From a843f3417746a020f814019ae387d42de7f41cf0 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Nov 2020 13:41:56 +0100
Subject: [PATCH 212/228] CI: require a sufficiently-recent JSON-Schema

---
 ci/configvalidator.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/configvalidator.py b/ci/configvalidator.py
index 5c0ee4559..cde3527f6 100644
--- a/ci/configvalidator.py
+++ b/ci/configvalidator.py
@@ -45,6 +45,7 @@ ERR_IMPORT, ERR_USAGE, ERR_FILE_NOT_FOUND, ERR_SYNTAX, ERR_INVALID = range(1,6)
 #
 try:
     from jsonschema import validate, SchemaError, ValidationError
+    from jsonschema import draft7_format_checker
     from yaml import safe_load, YAMLError
 except ImportError as e:
     print(e)

From 4e9c18a565629ad62225715177ec3d2177f097fc Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Nov 2020 15:14:41 +0100
Subject: [PATCH 213/228] [users] Translate PWQuality error messages with
 numbers

---
 src/modules/users/CheckPWQuality.cpp | 44 ++++++++++++++++------------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/src/modules/users/CheckPWQuality.cpp b/src/modules/users/CheckPWQuality.cpp
index 9332c6080..44e35b1f5 100644
--- a/src/modules/users/CheckPWQuality.cpp
+++ b/src/modules/users/CheckPWQuality.cpp
@@ -172,62 +172,66 @@ public:
         case PWQ_ERROR_MIN_DIGITS:
             if ( auxerror )
             {
-                return QCoreApplication::translate( "PWQ", "The password contains less than %1 digits" )
-                    .arg( mungeLong( auxerror ) );
+                return QCoreApplication::translate(
+                    "PWQ", "The password contains fewer than %n digits", nullptr, mungeLong( auxerror ) );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too few digits" );
         case PWQ_ERROR_MIN_UPPERS:
             if ( auxerror )
             {
-                return QCoreApplication::translate( "PWQ", "The password contains less than %1 uppercase letters" )
-                    .arg( mungeLong( auxerror ) );
+                return QCoreApplication::translate(
+                    "PWQ", "The password contains fewer than %n uppercase letters", nullptr, mungeLong( auxerror ) );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too few uppercase letters" );
         case PWQ_ERROR_MIN_LOWERS:
             if ( auxerror )
             {
-                return QCoreApplication::translate( "PWQ", "The password contains less than %1 lowercase letters" )
-                    .arg( mungeLong( auxerror ) );
+                return QCoreApplication::translate(
+                    "PWQ", "The password contains fewer  than %n lowercase letters", nullptr, mungeLong( auxerror ) );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too few lowercase letters" );
         case PWQ_ERROR_MIN_OTHERS:
             if ( auxerror )
             {
                 return QCoreApplication::translate( "PWQ",
-                                                    "The password contains less than %1 non-alphanumeric characters" )
-                    .arg( mungeLong( auxerror ) );
+                                                    "The password contains fewer than %n non-alphanumeric characters",
+                                                    nullptr,
+                                                    mungeLong( auxerror ) );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too few non-alphanumeric characters" );
         case PWQ_ERROR_MIN_LENGTH:
             if ( auxerror )
             {
-                return QCoreApplication::translate( "PWQ", "The password is shorter than %1 characters" )
-                    .arg( mungeLong( auxerror ) );
+                return QCoreApplication::translate(
+                    "PWQ", "The password is shorter than %n characters", nullptr, mungeLong( auxerror ) );
             }
             return QCoreApplication::translate( "PWQ", "The password is too short" );
         case PWQ_ERROR_ROTATED:
-            return QCoreApplication::translate( "PWQ", "The password is just rotated old one" );
+            return QCoreApplication::translate( "PWQ", "The password is a rotated version of the previous one" );
         case PWQ_ERROR_MIN_CLASSES:
             if ( auxerror )
             {
-                return QCoreApplication::translate( "PWQ", "The password contains less than %1 character classes" )
-                    .arg( mungeLong( auxerror ) );
+                return QCoreApplication::translate(
+                    "PWQ", "The password contains fewer than %n character classes", nullptr, mungeLong( auxerror ) );
             }
             return QCoreApplication::translate( "PWQ", "The password does not contain enough character classes" );
         case PWQ_ERROR_MAX_CONSECUTIVE:
             if ( auxerror )
             {
                 return QCoreApplication::translate( "PWQ",
-                                                    "The password contains more than %1 same characters consecutively" )
-                    .arg( mungeLong( auxerror ) );
+                                                    "The password contains more than %n same characters consecutively",
+                                                    nullptr,
+                                                    mungeLong( auxerror ) );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too many same characters consecutively" );
         case PWQ_ERROR_MAX_CLASS_REPEAT:
             if ( auxerror )
             {
                 return QCoreApplication::translate(
-                           "PWQ", "The password contains more than %1 characters of the same class consecutively" )
-                    .arg( mungeLong( auxerror ) );
+                    "PWQ",
+                    "The password contains more than %n characters of the same class consecutively",
+                    nullptr,
+                    mungeLong( auxerror ) );
             }
             return QCoreApplication::translate(
                 "PWQ", "The password contains too many characters of the same class consecutively" );
@@ -235,8 +239,10 @@ public:
             if ( auxerror )
             {
                 return QCoreApplication::translate(
-                           "PWQ", "The password contains monotonic sequence longer than %1 characters" )
-                    .arg( mungeLong( auxerror ) );
+                    "PWQ",
+                    "The password contains monotonic sequence longer than %n characters",
+                    nullptr,
+                    mungeLong( auxerror ) );
             }
             return QCoreApplication::translate( "PWQ",
                                                 "The password contains too long of a monotonic character sequence" );

From a5dfe7cd68870fc577a80f02054072b43281f2ca Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Nov 2020 15:14:54 +0100
Subject: [PATCH 214/228] i18n: update english translations

---
 lang/calamares_en.ts                          | 442 ++++++++++--------
 lang/python.pot                               | 169 +++----
 .../dummypythonqt/lang/dummypythonqt.pot      |  18 +-
 3 files changed, 335 insertions(+), 294 deletions(-)

diff --git a/lang/calamares_en.ts b/lang/calamares_en.ts
index 88c923a96..0ef707a3d 100644
--- a/lang/calamares_en.ts
+++ b/lang/calamares_en.ts
@@ -4,17 +4,17 @@
   <context>
     <name>BootInfoWidget</name>
     <message>
-      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="61"/>
+      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="62"/>
       <source>The &lt;strong&gt;boot environment&lt;/strong&gt; of this system.&lt;br&gt;&lt;br&gt;Older x86 systems only support &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Modern systems usually use &lt;strong&gt;EFI&lt;/strong&gt;, but may also show up as BIOS if started in compatibility mode.</source>
       <translation>The &lt;strong&gt;boot environment&lt;/strong&gt; of this system.&lt;br&gt;&lt;br&gt;Older x86 systems only support &lt;strong&gt;BIOS&lt;/strong&gt;.&lt;br&gt;Modern systems usually use &lt;strong&gt;EFI&lt;/strong&gt;, but may also show up as BIOS if started in compatibility mode.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="71"/>
+      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="72"/>
       <source>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</source>
       <translation>This system was started with an &lt;strong&gt;EFI&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from an EFI environment, this installer must deploy a boot loader application, like &lt;strong&gt;GRUB&lt;/strong&gt; or &lt;strong&gt;systemd-boot&lt;/strong&gt; on an &lt;strong&gt;EFI System Partition&lt;/strong&gt;. This is automatic, unless you choose manual partitioning, in which case you must choose it or create it on your own.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="83"/>
+      <location filename="../src/modules/partition/gui/BootInfoWidget.cpp" line="84"/>
       <source>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</source>
       <translation>This system was started with a &lt;strong&gt;BIOS&lt;/strong&gt; boot environment.&lt;br&gt;&lt;br&gt;To configure startup from a BIOS environment, this installer must install a boot loader, like &lt;strong&gt;GRUB&lt;/strong&gt;, either at the beginning of a partition or on the &lt;strong&gt;Master Boot Record&lt;/strong&gt; near the beginning of the partition table (preferred). This is automatic, unless you choose manual partitioning, in which case you must set it up on your own.</translation>
     </message>
@@ -533,7 +533,7 @@ The installer will quit and all changes will be lost.</translation>
       <translation>&lt;strong&gt;Manual partitioning&lt;/strong&gt;&lt;br/&gt;You can create or resize partitions yourself.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="831"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="828"/>
       <source>Reuse %1 as home partition for %2.</source>
       <translation>Reuse %1 as home partition for %2.</translation>
     </message>
@@ -558,101 +558,101 @@ The installer will quit and all changes will be lost.</translation>
       <translation>&lt;strong&gt;Select a partition to install on&lt;/strong&gt;</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1146"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1148"/>
       <source>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</source>
       <translation>An EFI system partition cannot be found anywhere on this system. Please go back and use manual partitioning to set up %1.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1154"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1156"/>
       <source>The EFI system partition at %1 will be used for starting %2.</source>
       <translation>The EFI system partition at %1 will be used for starting %2.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1162"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1164"/>
       <source>EFI system partition:</source>
       <translation>EFI system partition:</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1296"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1297"/>
       <source>This storage device does not seem to have an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
       <translation>This storage device does not seem to have an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1301"/>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1338"/>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1360"/>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1385"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1302"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1339"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1361"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1386"/>
       <source>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color="red"&gt;delete&lt;/font&gt; all data currently present on the selected storage device.</source>
       <translation>&lt;strong&gt;Erase disk&lt;/strong&gt;&lt;br/&gt;This will &lt;font color="red"&gt;delete&lt;/font&gt; all data currently present on the selected storage device.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1305"/>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1334"/>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1356"/>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1381"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1306"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1335"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1357"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1382"/>
       <source>&lt;strong&gt;Install alongside&lt;/strong&gt;&lt;br/&gt;The installer will shrink a partition to make room for %1.</source>
       <translation>&lt;strong&gt;Install alongside&lt;/strong&gt;&lt;br/&gt;The installer will shrink a partition to make room for %1.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1309"/>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1343"/>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1364"/>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1389"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1310"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1344"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1365"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1390"/>
       <source>&lt;strong&gt;Replace a partition&lt;/strong&gt;&lt;br/&gt;Replaces a partition with %1.</source>
       <translation>&lt;strong&gt;Replace a partition&lt;/strong&gt;&lt;br/&gt;Replaces a partition with %1.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1328"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1329"/>
       <source>This storage device has %1 on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
       <translation>This storage device has %1 on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1351"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1352"/>
       <source>This storage device already has an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
       <translation>This storage device already has an operating system on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1376"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1377"/>
       <source>This storage device has multiple operating systems on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</source>
       <translation>This storage device has multiple operating systems on it. What would you like to do?&lt;br/&gt;You will be able to review and confirm your choices before any change is made to the storage device.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1448"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1449"/>
       <source>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</source>
       <translation>This storage device already has an operating system on it, but the partition table &lt;strong&gt;%1&lt;/strong&gt; is different from the needed &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1471"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1472"/>
       <source>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</source>
       <translation>This storage device has one of its partitions &lt;strong&gt;mounted&lt;/strong&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1476"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1477"/>
       <source>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</source>
       <translation>This storage device is a part of an &lt;strong&gt;inactive RAID&lt;/strong&gt; device.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1603"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1604"/>
       <source>No Swap</source>
       <translation>No Swap</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1611"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1612"/>
       <source>Reuse Swap</source>
       <translation>Reuse Swap</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1614"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1615"/>
       <source>Swap (no Hibernate)</source>
       <translation>Swap (no Hibernate)</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1617"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1618"/>
       <source>Swap (with Hibernate)</source>
       <translation>Swap (with Hibernate)</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1620"/>
+      <location filename="../src/modules/partition/gui/ChoicePage.cpp" line="1621"/>
       <source>Swap to file</source>
       <translation>Swap to file</translation>
     </message>
@@ -720,12 +720,12 @@ The installer will quit and all changes will be lost.</translation>
   <context>
     <name>Config</name>
     <message>
-      <location filename="../src/modules/keyboard/Config.cpp" line="340"/>
+      <location filename="../src/modules/keyboard/Config.cpp" line="326"/>
       <source>Set keyboard model to %1.&lt;br/&gt;</source>
       <translation>Set keyboard model to %1.&lt;br/&gt;</translation>
     </message>
     <message>
-      <location filename="../src/modules/keyboard/Config.cpp" line="347"/>
+      <location filename="../src/modules/keyboard/Config.cpp" line="333"/>
       <source>Set keyboard layout to %1/%2.</source>
       <translation>Set keyboard layout to %1/%2.</translation>
     </message>
@@ -810,47 +810,47 @@ The installer will quit and all changes will be lost.</translation>
       <translation>&lt;h1&gt;Welcome to the %1 installer&lt;/h1&gt;</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="164"/>
+      <location filename="../src/modules/users/Config.cpp" line="200"/>
       <source>Your username is too long.</source>
       <translation>Your username is too long.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="170"/>
+      <location filename="../src/modules/users/Config.cpp" line="206"/>
       <source>'%1' is not allowed as username.</source>
       <translation>'%1' is not allowed as username.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="177"/>
+      <location filename="../src/modules/users/Config.cpp" line="213"/>
       <source>Your username must start with a lowercase letter or underscore.</source>
       <translation>Your username must start with a lowercase letter or underscore.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="181"/>
+      <location filename="../src/modules/users/Config.cpp" line="217"/>
       <source>Only lowercase letters, numbers, underscore and hyphen are allowed.</source>
       <translation>Only lowercase letters, numbers, underscore and hyphen are allowed.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="227"/>
+      <location filename="../src/modules/users/Config.cpp" line="262"/>
       <source>Your hostname is too short.</source>
       <translation>Your hostname is too short.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="231"/>
+      <location filename="../src/modules/users/Config.cpp" line="266"/>
       <source>Your hostname is too long.</source>
       <translation>Your hostname is too long.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="237"/>
+      <location filename="../src/modules/users/Config.cpp" line="272"/>
       <source>'%1' is not allowed as hostname.</source>
       <translation>'%1' is not allowed as hostname.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="243"/>
+      <location filename="../src/modules/users/Config.cpp" line="278"/>
       <source>Only letters, numbers, underscore and hyphen are allowed.</source>
       <translation>Only letters, numbers, underscore and hyphen are allowed.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="446"/>
+      <location filename="../src/modules/users/Config.cpp" line="481"/>
       <source>Your passwords do not match!</source>
       <translation>Your passwords do not match!</translation>
     </message>
@@ -1018,29 +1018,39 @@ The installer will quit and all changes will be lost.</translation>
   <context>
     <name>CreateUserJob</name>
     <message>
-      <location filename="../src/modules/users/CreateUserJob.cpp" line="40"/>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="36"/>
       <source>Create user %1</source>
       <translation>Create user %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CreateUserJob.cpp" line="47"/>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="43"/>
       <source>Create user &lt;strong&gt;%1&lt;/strong&gt;.</source>
       <translation>Create user &lt;strong&gt;%1&lt;/strong&gt;.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CreateUserJob.cpp" line="54"/>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="50"/>
       <source>Creating user %1.</source>
       <translation>Creating user %1.</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CreateUserJob.cpp" line="186"/>
-      <source>Cannot create sudoers file for writing.</source>
-      <translation>Cannot create sudoers file for writing.</translation>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="126"/>
+      <source>Preserving home directory</source>
+      <translation type="unfinished"/>
     </message>
     <message>
-      <location filename="../src/modules/users/CreateUserJob.cpp" line="181"/>
-      <source>Cannot chmod sudoers file.</source>
-      <translation>Cannot chmod sudoers file.</translation>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="143"/>
+      <source>Creating user %1</source>
+      <translation type="unfinished">Creating user %1. {1?}</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="151"/>
+      <source>Configuring user %1</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CreateUserJob.cpp" line="159"/>
+      <source>Setting file permissions</source>
+      <translation type="unfinished"/>
     </message>
   </context>
   <context>
@@ -1243,7 +1253,7 @@ The installer will quit and all changes will be lost.</translation>
       <translation>Flags:</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="272"/>
+      <location filename="../src/modules/partition/gui/EditExistingPartitionDialog.cpp" line="275"/>
       <source>Mountpoint already in use. Please select another one.</source>
       <translation>Mountpoint already in use. Please select another one.</translation>
     </message>
@@ -1558,23 +1568,10 @@ The installer will quit and all changes will be lost.</translation>
       <translation>Script</translation>
     </message>
   </context>
-  <context>
-    <name>KeyboardPage</name>
-    <message>
-      <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="204"/>
-      <source>Set keyboard model to %1.&lt;br/&gt;</source>
-      <translation>Set keyboard model to %1.&lt;br/&gt;</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/keyboard/KeyboardPage.cpp" line="208"/>
-      <source>Set keyboard layout to %1/%2.</source>
-      <translation>Set keyboard layout to %1/%2.</translation>
-    </message>
-  </context>
   <context>
     <name>KeyboardQmlViewStep</name>
     <message>
-      <location filename="../src/modules/keyboardq/KeyboardQmlViewStep.cpp" line="33"/>
+      <location filename="../src/modules/keyboardq/KeyboardQmlViewStep.cpp" line="32"/>
       <source>Keyboard</source>
       <translation>Keyboard</translation>
     </message>
@@ -1582,7 +1579,7 @@ The installer will quit and all changes will be lost.</translation>
   <context>
     <name>KeyboardViewStep</name>
     <message>
-      <location filename="../src/modules/keyboard/KeyboardViewStep.cpp" line="45"/>
+      <location filename="../src/modules/keyboard/KeyboardViewStep.cpp" line="42"/>
       <source>Keyboard</source>
       <translation>Keyboard</translation>
     </message>
@@ -1664,59 +1661,59 @@ The installer will quit and all changes will be lost.</translation>
   <context>
     <name>LicenseWidget</name>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="87"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="88"/>
       <source>URL: %1</source>
       <translation>URL: %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="108"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="109"/>
       <source>&lt;strong&gt;%1 driver&lt;/strong&gt;&lt;br/&gt;by %2</source>
       <extracomment>%1 is an untranslatable product name, example: Creative Audigy driver</extracomment>
       <translation>&lt;strong&gt;%1 driver&lt;/strong&gt;&lt;br/&gt;by %2</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="115"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="116"/>
       <source>&lt;strong&gt;%1 graphics driver&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
       <extracomment>%1 is usually a vendor name, example: Nvidia graphics driver</extracomment>
       <translation>&lt;strong&gt;%1 graphics driver&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="121"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="122"/>
       <source>&lt;strong&gt;%1 browser plugin&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
       <translation>&lt;strong&gt;%1 browser plugin&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="127"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="128"/>
       <source>&lt;strong&gt;%1 codec&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
       <translation>&lt;strong&gt;%1 codec&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="133"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="134"/>
       <source>&lt;strong&gt;%1 package&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
       <translation>&lt;strong&gt;%1 package&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="139"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="140"/>
       <source>&lt;strong&gt;%1&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</source>
       <translation>&lt;strong&gt;%1&lt;/strong&gt;&lt;br/&gt;&lt;font color="Grey"&gt;by %2&lt;/font&gt;</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="162"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="163"/>
       <source>File: %1</source>
       <translation>File: %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="185"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
       <source>Hide license text</source>
       <translation>Hide license text</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="185"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="186"/>
       <source>Show the license text</source>
       <translation>Show the license text</translation>
     </message>
     <message>
-      <location filename="../src/modules/license/LicenseWidget.cpp" line="189"/>
+      <location filename="../src/modules/license/LicenseWidget.cpp" line="190"/>
       <source>Open license agreement in browser.</source>
       <translation>Open license agreement in browser.</translation>
     </message>
@@ -1724,18 +1721,18 @@ The installer will quit and all changes will be lost.</translation>
   <context>
     <name>LocalePage</name>
     <message>
-      <location filename="../src/modules/locale/LocalePage.cpp" line="124"/>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="130"/>
       <source>Region:</source>
       <translation>Region:</translation>
     </message>
     <message>
-      <location filename="../src/modules/locale/LocalePage.cpp" line="125"/>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="131"/>
       <source>Zone:</source>
       <translation>Zone:</translation>
     </message>
     <message>
-      <location filename="../src/modules/locale/LocalePage.cpp" line="126"/>
-      <location filename="../src/modules/locale/LocalePage.cpp" line="127"/>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="132"/>
+      <location filename="../src/modules/locale/LocalePage.cpp" line="133"/>
       <source>&amp;Change...</source>
       <translation>&amp;Change...</translation>
     </message>
@@ -2057,188 +2054,215 @@ The installer will quit and all changes will be lost.</translation>
       <source>The password contains forbidden words in some form</source>
       <translation>The password contains forbidden words in some form</translation>
     </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="175"/>
-      <source>The password contains less than %1 digits</source>
-      <translation>The password contains less than %1 digits</translation>
-    </message>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="178"/>
       <source>The password contains too few digits</source>
       <translation>The password contains too few digits</translation>
     </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="182"/>
-      <source>The password contains less than %1 uppercase letters</source>
-      <translation>The password contains less than %1 uppercase letters</translation>
-    </message>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="185"/>
       <source>The password contains too few uppercase letters</source>
       <translation>The password contains too few uppercase letters</translation>
     </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="189"/>
-      <source>The password contains less than %1 lowercase letters</source>
-      <translation>The password contains less than %1 lowercase letters</translation>
-    </message>
     <message>
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="192"/>
       <source>The password contains too few lowercase letters</source>
       <translation>The password contains too few lowercase letters</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
-      <source>The password contains less than %1 non-alphanumeric characters</source>
-      <translation>The password contains less than %1 non-alphanumeric characters</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="200"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="201"/>
       <source>The password contains too few non-alphanumeric characters</source>
       <translation>The password contains too few non-alphanumeric characters</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="204"/>
-      <source>The password is shorter than %1 characters</source>
-      <translation>The password is shorter than %1 characters</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="207"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="208"/>
       <source>The password is too short</source>
       <translation>The password is too short</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="209"/>
-      <source>The password is just rotated old one</source>
-      <translation>The password is just rotated old one</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="213"/>
-      <source>The password contains less than %1 character classes</source>
-      <translation>The password contains less than %1 character classes</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="216"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="217"/>
       <source>The password does not contain enough character classes</source>
       <translation>The password does not contain enough character classes</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="220"/>
-      <source>The password contains more than %1 same characters consecutively</source>
-      <translation>The password contains more than %1 same characters consecutively</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="224"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="226"/>
       <source>The password contains too many same characters consecutively</source>
       <translation>The password contains too many same characters consecutively</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="228"/>
-      <source>The password contains more than %1 characters of the same class consecutively</source>
-      <translation>The password contains more than %1 characters of the same class consecutively</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="232"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="236"/>
       <source>The password contains too many characters of the same class consecutively</source>
       <translation>The password contains too many characters of the same class consecutively</translation>
     </message>
-    <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="237"/>
-      <source>The password contains monotonic sequence longer than %1 characters</source>
-      <translation>The password contains monotonic sequence longer than %1 characters</translation>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="175"/>
+      <source>The password contains fewer than %n digits</source>
+      <translation type="unfinished">
+        <numerusform/>
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="182"/>
+      <source>The password contains fewer than %n uppercase letters</source>
+      <translation type="unfinished">
+        <numerusform/>
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="189"/>
+      <source>The password contains fewer  than %n lowercase letters</source>
+      <translation type="unfinished">
+        <numerusform/>
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="196"/>
+      <source>The password contains fewer than %n non-alphanumeric characters</source>
+      <translation type="unfinished">
+        <numerusform/>
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="205"/>
+      <source>The password is shorter than %n characters</source>
+      <translation type="unfinished">
+        <numerusform/>
+        <numerusform/>
+      </translation>
     </message>
     <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="210"/>
+      <source>The password is a rotated version of the previous one</source>
+      <translation type="unfinished"/>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="214"/>
+      <source>The password contains fewer than %n character classes</source>
+      <translation type="unfinished">
+        <numerusform/>
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="221"/>
+      <source>The password contains more than %n same characters consecutively</source>
+      <translation type="unfinished">
+        <numerusform/>
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="230"/>
+      <source>The password contains more than %n characters of the same class consecutively</source>
+      <translation type="unfinished">
+        <numerusform/>
+        <numerusform/>
+      </translation>
+    </message>
+    <message numerus="yes">
       <location filename="../src/modules/users/CheckPWQuality.cpp" line="241"/>
+      <source>The password contains monotonic sequence longer than %n characters</source>
+      <translation type="unfinished">
+        <numerusform/>
+        <numerusform/>
+      </translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="247"/>
       <source>The password contains too long of a monotonic character sequence</source>
       <translation>The password contains too long of a monotonic character sequence</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="244"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="250"/>
       <source>No password supplied</source>
       <translation>No password supplied</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="246"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="252"/>
       <source>Cannot obtain random numbers from the RNG device</source>
       <translation>Cannot obtain random numbers from the RNG device</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="248"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="254"/>
       <source>Password generation failed - required entropy too low for settings</source>
       <translation>Password generation failed - required entropy too low for settings</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="254"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="260"/>
       <source>The password fails the dictionary check - %1</source>
       <translation>The password fails the dictionary check - %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="257"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="263"/>
       <source>The password fails the dictionary check</source>
       <translation>The password fails the dictionary check</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="261"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="267"/>
       <source>Unknown setting - %1</source>
       <translation>Unknown setting - %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="265"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="271"/>
       <source>Unknown setting</source>
       <translation>Unknown setting</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="269"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="275"/>
       <source>Bad integer value of setting - %1</source>
       <translation>Bad integer value of setting - %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="274"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="280"/>
       <source>Bad integer value</source>
       <translation>Bad integer value</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="278"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="284"/>
       <source>Setting %1 is not of integer type</source>
       <translation>Setting %1 is not of integer type</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="283"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="289"/>
       <source>Setting is not of integer type</source>
       <translation>Setting is not of integer type</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="287"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="293"/>
       <source>Setting %1 is not of string type</source>
       <translation>Setting %1 is not of string type</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="292"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="298"/>
       <source>Setting is not of string type</source>
       <translation>Setting is not of string type</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="294"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="300"/>
       <source>Opening the configuration file failed</source>
       <translation>Opening the configuration file failed</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="296"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="302"/>
       <source>The configuration file is malformed</source>
       <translation>The configuration file is malformed</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="298"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="304"/>
       <source>Fatal failure</source>
       <translation>Fatal failure</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/CheckPWQuality.cpp" line="300"/>
+      <location filename="../src/modules/users/CheckPWQuality.cpp" line="306"/>
       <source>Unknown error</source>
       <translation>Unknown error</translation>
     </message>
     <message>
-      <location filename="../src/modules/users/Config.cpp" line="651"/>
+      <location filename="../src/modules/users/Config.cpp" line="729"/>
       <source>Password is empty</source>
       <translation>Password is empty</translation>
     </message>
@@ -2572,117 +2596,117 @@ The installer will quit and all changes will be lost.</translation>
   <context>
     <name>PartitionViewStep</name>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="69"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="70"/>
       <source>Gathering system information...</source>
       <translation>Gathering system information...</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="124"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="125"/>
       <source>Partitions</source>
       <translation>Partitions</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="162"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="163"/>
       <source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system.</source>
       <translation>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="166"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="167"/>
       <source>&lt;strong&gt;Erase&lt;/strong&gt; disk and install %1.</source>
       <translation>&lt;strong&gt;Erase&lt;/strong&gt; disk and install %1.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="169"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="170"/>
       <source>&lt;strong&gt;Replace&lt;/strong&gt; a partition with %1.</source>
       <translation>&lt;strong&gt;Replace&lt;/strong&gt; a partition with %1.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="173"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="174"/>
       <source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning.</source>
       <translation>&lt;strong&gt;Manual&lt;/strong&gt; partitioning.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="186"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="187"/>
       <source>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system on disk &lt;strong&gt;%2&lt;/strong&gt; (%3).</source>
       <translation>Install %1 &lt;strong&gt;alongside&lt;/strong&gt; another operating system on disk &lt;strong&gt;%2&lt;/strong&gt; (%3).</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="193"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="194"/>
       <source>&lt;strong&gt;Erase&lt;/strong&gt; disk &lt;strong&gt;%2&lt;/strong&gt; (%3) and install %1.</source>
       <translation>&lt;strong&gt;Erase&lt;/strong&gt; disk &lt;strong&gt;%2&lt;/strong&gt; (%3) and install %1.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="199"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="200"/>
       <source>&lt;strong&gt;Replace&lt;/strong&gt; a partition on disk &lt;strong&gt;%2&lt;/strong&gt; (%3) with %1.</source>
       <translation>&lt;strong&gt;Replace&lt;/strong&gt; a partition on disk &lt;strong&gt;%2&lt;/strong&gt; (%3) with %1.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="206"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="207"/>
       <source>&lt;strong&gt;Manual&lt;/strong&gt; partitioning on disk &lt;strong&gt;%1&lt;/strong&gt; (%2).</source>
       <translation>&lt;strong&gt;Manual&lt;/strong&gt; partitioning on disk &lt;strong&gt;%1&lt;/strong&gt; (%2).</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="215"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="216"/>
       <source>Disk &lt;strong&gt;%1&lt;/strong&gt; (%2)</source>
       <translation>Disk &lt;strong&gt;%1&lt;/strong&gt; (%2)</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="241"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="242"/>
       <source>Current:</source>
       <translation>Current:</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="259"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="260"/>
       <source>After:</source>
       <translation>After:</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="426"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="427"/>
       <source>No EFI system partition configured</source>
       <translation>No EFI system partition configured</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="427"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="428"/>
       <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;%3&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</source>
       <translation>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;To configure an EFI system partition, go back and select or create a FAT32 filesystem with the &lt;strong&gt;%3&lt;/strong&gt; flag enabled and mount point &lt;strong&gt;%2&lt;/strong&gt;.&lt;br/&gt;&lt;br/&gt;You can continue without setting up an EFI system partition but your system may fail to start.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="441"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="442"/>
       <source>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;%3&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</source>
       <translation>An EFI system partition is necessary to start %1.&lt;br/&gt;&lt;br/&gt;A partition was configured with mount point &lt;strong&gt;%2&lt;/strong&gt; but its &lt;strong&gt;%3&lt;/strong&gt; flag is not set.&lt;br/&gt;To set the flag, go back and edit the partition.&lt;br/&gt;&lt;br/&gt;You can continue without setting the flag but your system may fail to start.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="440"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="441"/>
       <source>EFI system partition flag not set</source>
       <translation>EFI system partition flag not set</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="467"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="468"/>
       <source>Option to use GPT on BIOS</source>
       <translation>Option to use GPT on BIOS</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="468"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="469"/>
       <source>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</source>
       <translation>A GPT partition table is the best option for all systems. This installer supports such a setup for BIOS systems too.&lt;br/&gt;&lt;br/&gt;To configure a GPT partition table on BIOS, (if not done so already) go back and set the partition table to GPT, next create a 8 MB unformatted partition with the &lt;strong&gt;bios_grub&lt;/strong&gt; flag enabled.&lt;br/&gt;&lt;br/&gt;An unformatted 8 MB partition is necessary to start %1 on a BIOS system with GPT.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="496"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="497"/>
       <source>Boot partition not encrypted</source>
       <translation>Boot partition not encrypted</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="497"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="498"/>
       <source>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</source>
       <translation>A separate boot partition was set up together with an encrypted root partition, but the boot partition is not encrypted.&lt;br/&gt;&lt;br/&gt;There are security concerns with this kind of setup, because important system files are kept on an unencrypted partition.&lt;br/&gt;You may continue if you wish, but filesystem unlocking will happen later during system startup.&lt;br/&gt;To encrypt the boot partition, go back and recreate it, selecting &lt;strong&gt;Encrypt&lt;/strong&gt; in the partition creation window.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="626"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="627"/>
       <source>has at least one disk device available.</source>
       <translation>has at least one disk device available.</translation>
     </message>
     <message>
-      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="627"/>
+      <location filename="../src/modules/partition/gui/PartitionViewStep.cpp" line="628"/>
       <source>There are no partitions to install on.</source>
       <translation>There are no partitions to install on.</translation>
     </message>
@@ -2842,13 +2866,8 @@ Output:
       <translation>swap</translation>
     </message>
     <message>
-      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="90"/>
-      <source>Default Keyboard Model</source>
-      <translation>Default Keyboard Model</translation>
-    </message>
-    <message>
-      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="136"/>
-      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="173"/>
+      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="130"/>
+      <location filename="../src/modules/keyboard/keyboardwidget/keyboardglobal.cpp" line="167"/>
       <source>Default</source>
       <translation>Default</translation>
     </message>
@@ -3232,29 +3251,29 @@ Output:
   <context>
     <name>SetKeyboardLayoutJob</name>
     <message>
-      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="53"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="55"/>
       <source>Set keyboard model to %1, layout to %2-%3</source>
       <translation>Set keyboard model to %1, layout to %2-%3</translation>
     </message>
     <message>
-      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="356"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="368"/>
       <source>Failed to write keyboard configuration for the virtual console.</source>
       <translation>Failed to write keyboard configuration for the virtual console.</translation>
     </message>
     <message>
-      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="357"/>
-      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="361"/>
-      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="368"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="369"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="397"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="414"/>
       <source>Failed to write to %1</source>
       <translation>Failed to write to %1</translation>
     </message>
     <message>
-      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="360"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="396"/>
       <source>Failed to write keyboard configuration for X11.</source>
       <translation>Failed to write keyboard configuration for X11.</translation>
     </message>
     <message>
-      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="367"/>
+      <location filename="../src/modules/keyboard/SetKeyboardLayoutJob.cpp" line="413"/>
       <source>Failed to write keyboard configuration to existing /etc/default directory.</source>
       <translation>Failed to write keyboard configuration to existing /etc/default directory.</translation>
     </message>
@@ -3423,6 +3442,43 @@ Output:
       <translation>Cannot open /etc/timezone for writing</translation>
     </message>
   </context>
+  <context>
+    <name>SetupGroupsJob</name>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="166"/>
+      <source>Preparing groups.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="178"/>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="183"/>
+      <source>Could not create groups in target system</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="184"/>
+      <source>These groups are missing in the target system: %1</source>
+      <translation type="unfinished"/>
+    </message>
+  </context>
+  <context>
+    <name>SetupSudoJob</name>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="33"/>
+      <source>Configure &lt;pre&gt;sudo&lt;/pre&gt; users.</source>
+      <translation type="unfinished"/>
+    </message>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="55"/>
+      <source>Cannot chmod sudoers file.</source>
+      <translation type="unfinished">Cannot chmod sudoers file.</translation>
+    </message>
+    <message>
+      <location filename="../src/modules/users/MiscJobs.cpp" line="60"/>
+      <source>Cannot create sudoers file for writing.</source>
+      <translation type="unfinished">Cannot create sudoers file for writing.</translation>
+    </message>
+  </context>
   <context>
     <name>ShellProcessJob</name>
     <message>
@@ -3443,12 +3499,12 @@ Output:
   <context>
     <name>SummaryPage</name>
     <message>
-      <location filename="../src/modules/summary/SummaryPage.cpp" line="47"/>
+      <location filename="../src/modules/summary/SummaryPage.cpp" line="48"/>
       <source>This is an overview of what will happen once you start the setup procedure.</source>
       <translation>This is an overview of what will happen once you start the setup procedure.</translation>
     </message>
     <message>
-      <location filename="../src/modules/summary/SummaryPage.cpp" line="49"/>
+      <location filename="../src/modules/summary/SummaryPage.cpp" line="50"/>
       <source>This is an overview of what will happen once you start the install procedure.</source>
       <translation>This is an overview of what will happen once you start the install procedure.</translation>
     </message>
diff --git a/lang/python.pot b/lang/python.pot
index 5dc844031..1de1081b7 100644
--- a/lang/python.pot
+++ b/lang/python.pot
@@ -2,32 +2,32 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-16 22:35+0200\n"
+"POT-Creation-Date: 2020-11-09 15:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: src/modules/grubcfg/main.py:28
 msgid "Configure GRUB."
-msgstr "Configure GRUB."
+msgstr ""
 
-#: src/modules/mount/main.py:29
+#: src/modules/mount/main.py:30
 msgid "Mounting partitions."
-msgstr "Mounting partitions."
+msgstr ""
 
-#: src/modules/mount/main.py:141 src/modules/initcpiocfg/main.py:196
-#: src/modules/initcpiocfg/main.py:200
+#: src/modules/mount/main.py:127 src/modules/initcpiocfg/main.py:199
+#: src/modules/initcpiocfg/main.py:203
 #: src/modules/luksopenswaphookcfg/main.py:86
 #: src/modules/luksopenswaphookcfg/main.py:90 src/modules/rawfs/main.py:164
 #: src/modules/initramfscfg/main.py:85 src/modules/initramfscfg/main.py:89
@@ -36,327 +36,312 @@ msgstr "Mounting partitions."
 #: src/modules/fstab/main.py:367 src/modules/localecfg/main.py:135
 #: src/modules/networkcfg/main.py:39
 msgid "Configuration Error"
-msgstr "Configuration Error"
+msgstr ""
 
-#: src/modules/mount/main.py:142 src/modules/initcpiocfg/main.py:197
+#: src/modules/mount/main.py:128 src/modules/initcpiocfg/main.py:200
 #: src/modules/luksopenswaphookcfg/main.py:87 src/modules/rawfs/main.py:165
 #: src/modules/initramfscfg/main.py:86 src/modules/openrcdmcryptcfg/main.py:70
 #: src/modules/fstab/main.py:362
 msgid "No partitions are defined for <pre>{!s}</pre> to use."
-msgstr "No partitions are defined for <pre>{!s}</pre> to use."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:26
 msgid "Configure systemd services"
-msgstr "Configure systemd services"
+msgstr ""
 
 #: src/modules/services-systemd/main.py:59
 #: src/modules/services-openrc/main.py:93
 msgid "Cannot modify service"
-msgstr "Cannot modify service"
+msgstr ""
 
 #: src/modules/services-systemd/main.py:60
 msgid ""
 "<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"<code>systemctl {arg!s}</code> call in chroot returned error code {num!s}."
 
 #: src/modules/services-systemd/main.py:63
 #: src/modules/services-systemd/main.py:67
 msgid "Cannot enable systemd service <code>{name!s}</code>."
-msgstr "Cannot enable systemd service <code>{name!s}</code>."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:65
 msgid "Cannot enable systemd target <code>{name!s}</code>."
-msgstr "Cannot enable systemd target <code>{name!s}</code>."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:69
 msgid "Cannot disable systemd target <code>{name!s}</code>."
-msgstr "Cannot disable systemd target <code>{name!s}</code>."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:71
 msgid "Cannot mask systemd unit <code>{name!s}</code>."
-msgstr "Cannot mask systemd unit <code>{name!s}</code>."
+msgstr ""
 
 #: src/modules/services-systemd/main.py:73
 msgid ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
+"Unknown systemd commands <code>{command!s}</code> and <code>{suffix!s}</"
+"code> for unit {name!s}."
 msgstr ""
-"Unknown systemd commands <code>{command!s}</code> and "
-"<code>{suffix!s}</code> for unit {name!s}."
 
 #: src/modules/umount/main.py:31
 msgid "Unmount file systems."
-msgstr "Unmount file systems."
+msgstr ""
 
 #: src/modules/unpackfs/main.py:35
 msgid "Filling up filesystems."
-msgstr "Filling up filesystems."
+msgstr ""
 
 #: src/modules/unpackfs/main.py:254
 msgid "rsync failed with error code {}."
-msgstr "rsync failed with error code {}."
+msgstr ""
 
 #: src/modules/unpackfs/main.py:299
 msgid "Unpacking image {}/{}, file {}/{}"
-msgstr "Unpacking image {}/{}, file {}/{}"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:314
 msgid "Starting to unpack {}"
-msgstr "Starting to unpack {}"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:323 src/modules/unpackfs/main.py:463
 msgid "Failed to unpack image \"{}\""
-msgstr "Failed to unpack image \"{}\""
+msgstr ""
 
 #: src/modules/unpackfs/main.py:430
 msgid "No mount point for root partition"
-msgstr "No mount point for root partition"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:431
 msgid "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
-msgstr "globalstorage does not contain a \"rootMountPoint\" key, doing nothing"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:436
 msgid "Bad mount point for root partition"
-msgstr "Bad mount point for root partition"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:437
 msgid "rootMountPoint is \"{}\", which does not exist, doing nothing"
-msgstr "rootMountPoint is \"{}\", which does not exist, doing nothing"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:453 src/modules/unpackfs/main.py:457
 #: src/modules/unpackfs/main.py:477
 msgid "Bad unsquash configuration"
-msgstr "Bad unsquash configuration"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:454
 msgid "The filesystem for \"{}\" ({}) is not supported by your current kernel"
-msgstr "The filesystem for \"{}\" ({}) is not supported by your current kernel"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:458
 msgid "The source filesystem \"{}\" does not exist"
-msgstr "The source filesystem \"{}\" does not exist"
+msgstr ""
 
 #: src/modules/unpackfs/main.py:464
 msgid ""
 "Failed to find unsquashfs, make sure you have the squashfs-tools package "
 "installed"
 msgstr ""
-"Failed to find unsquashfs, make sure you have the squashfs-tools package "
-"installed"
 
 #: src/modules/unpackfs/main.py:478
 msgid "The destination \"{}\" in the target system is not a directory"
-msgstr "The destination \"{}\" in the target system is not a directory"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:514
 msgid "Cannot write KDM configuration file"
-msgstr "Cannot write KDM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:515
 msgid "KDM config file {!s} does not exist"
-msgstr "KDM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:576
 msgid "Cannot write LXDM configuration file"
-msgstr "Cannot write LXDM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:577
 msgid "LXDM config file {!s} does not exist"
-msgstr "LXDM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:660
 msgid "Cannot write LightDM configuration file"
-msgstr "Cannot write LightDM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:661
 msgid "LightDM config file {!s} does not exist"
-msgstr "LightDM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:735
 msgid "Cannot configure LightDM"
-msgstr "Cannot configure LightDM"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:736
 msgid "No LightDM greeter installed."
-msgstr "No LightDM greeter installed."
+msgstr ""
 
 #: src/modules/displaymanager/main.py:767
 msgid "Cannot write SLIM configuration file"
-msgstr "Cannot write SLIM configuration file"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:768
 msgid "SLIM config file {!s} does not exist"
-msgstr "SLIM config file {!s} does not exist"
+msgstr ""
 
 #: src/modules/displaymanager/main.py:894
 msgid "No display managers selected for the displaymanager module."
-msgstr "No display managers selected for the displaymanager module."
+msgstr ""
 
 #: src/modules/displaymanager/main.py:895
 msgid ""
 "The displaymanagers list is empty or undefined in both globalstorage and "
 "displaymanager.conf."
 msgstr ""
-"The displaymanagers list is empty or undefined in both globalstorage and "
-"displaymanager.conf."
 
 #: src/modules/displaymanager/main.py:977
 msgid "Display manager configuration was incomplete"
-msgstr "Display manager configuration was incomplete"
+msgstr ""
 
 #: src/modules/initcpiocfg/main.py:28
 msgid "Configuring mkinitcpio."
-msgstr "Configuring mkinitcpio."
+msgstr ""
 
-#: src/modules/initcpiocfg/main.py:201
+#: src/modules/initcpiocfg/main.py:204
 #: src/modules/luksopenswaphookcfg/main.py:91
 #: src/modules/initramfscfg/main.py:90 src/modules/openrcdmcryptcfg/main.py:74
 #: src/modules/fstab/main.py:368 src/modules/localecfg/main.py:136
 #: src/modules/networkcfg/main.py:40
 msgid "No root mount point is given for <pre>{!s}</pre> to use."
-msgstr "No root mount point is given for <pre>{!s}</pre> to use."
+msgstr ""
 
 #: src/modules/luksopenswaphookcfg/main.py:26
 msgid "Configuring encrypted swap."
-msgstr "Configuring encrypted swap."
+msgstr ""
 
 #: src/modules/rawfs/main.py:26
 msgid "Installing data."
-msgstr "Installing data."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:29
 msgid "Configure OpenRC services"
-msgstr "Configure OpenRC services"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:57
 msgid "Cannot add service {name!s} to run-level {level!s}."
-msgstr "Cannot add service {name!s} to run-level {level!s}."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:59
 msgid "Cannot remove service {name!s} from run-level {level!s}."
-msgstr "Cannot remove service {name!s} from run-level {level!s}."
+msgstr ""
 
 #: src/modules/services-openrc/main.py:61
 msgid ""
 "Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
 "level {level!s}."
 msgstr ""
-"Unknown service-action <code>{arg!s}</code> for service {name!s} in run-"
-"level {level!s}."
 
 #: src/modules/services-openrc/main.py:94
 msgid ""
 "<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
 msgstr ""
-"<code>rc-update {arg!s}</code> call in chroot returned error code {num!s}."
 
 #: src/modules/services-openrc/main.py:101
 msgid "Target runlevel does not exist"
-msgstr "Target runlevel does not exist"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:102
 msgid ""
 "The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
 "exist."
 msgstr ""
-"The path for runlevel {level!s} is <code>{path!s}</code>, which does not "
-"exist."
 
 #: src/modules/services-openrc/main.py:110
 msgid "Target service does not exist"
-msgstr "Target service does not exist"
+msgstr ""
 
 #: src/modules/services-openrc/main.py:111
 msgid ""
-"The path for service {name!s} is <code>{path!s}</code>, which does not "
-"exist."
+"The path for service {name!s} is <code>{path!s}</code>, which does not exist."
 msgstr ""
-"The path for service {name!s} is <code>{path!s}</code>, which does not "
-"exist."
 
 #: src/modules/plymouthcfg/main.py:27
 msgid "Configure Plymouth theme"
-msgstr "Configure Plymouth theme"
+msgstr ""
 
 #: src/modules/packages/main.py:50 src/modules/packages/main.py:59
 #: src/modules/packages/main.py:69
 msgid "Install packages."
-msgstr "Install packages."
+msgstr ""
 
 #: src/modules/packages/main.py:57
 #, python-format
 msgid "Processing packages (%(count)d / %(total)d)"
-msgstr "Processing packages (%(count)d / %(total)d)"
+msgstr ""
 
 #: src/modules/packages/main.py:62
 #, python-format
 msgid "Installing one package."
 msgid_plural "Installing %(num)d packages."
-msgstr[0] "Installing one package."
-msgstr[1] "Installing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/modules/packages/main.py:65
 #, python-format
 msgid "Removing one package."
 msgid_plural "Removing %(num)d packages."
-msgstr[0] "Removing one package."
-msgstr[1] "Removing %(num)d packages."
+msgstr[0] ""
+msgstr[1] ""
 
 #: src/modules/bootloader/main.py:42
 msgid "Install bootloader."
-msgstr "Install bootloader."
+msgstr ""
 
 #: src/modules/hwclock/main.py:26
 msgid "Setting hardware clock."
-msgstr "Setting hardware clock."
+msgstr ""
 
 #: src/modules/mkinitfs/main.py:27
 msgid "Creating initramfs with mkinitfs."
-msgstr "Creating initramfs with mkinitfs."
+msgstr ""
 
 #: src/modules/mkinitfs/main.py:49
 msgid "Failed to run mkinitfs on the target"
-msgstr "Failed to run mkinitfs on the target"
+msgstr ""
 
 #: src/modules/mkinitfs/main.py:50 src/modules/dracut/main.py:50
 msgid "The exit code was {}"
-msgstr "The exit code was {}"
+msgstr ""
 
 #: src/modules/dracut/main.py:27
 msgid "Creating initramfs with dracut."
-msgstr "Creating initramfs with dracut."
+msgstr ""
 
 #: src/modules/dracut/main.py:49
 msgid "Failed to run dracut on the target"
-msgstr "Failed to run dracut on the target"
+msgstr ""
 
 #: src/modules/initramfscfg/main.py:32
 msgid "Configuring initramfs."
-msgstr "Configuring initramfs."
+msgstr ""
 
 #: src/modules/openrcdmcryptcfg/main.py:25
 msgid "Configuring OpenRC dmcrypt service."
-msgstr "Configuring OpenRC dmcrypt service."
+msgstr ""
 
 #: src/modules/fstab/main.py:29
 msgid "Writing fstab."
-msgstr "Writing fstab."
+msgstr ""
 
 #: src/modules/dummypython/main.py:35
 msgid "Dummy python job."
-msgstr "Dummy python job."
+msgstr ""
 
 #: src/modules/dummypython/main.py:37 src/modules/dummypython/main.py:93
 #: src/modules/dummypython/main.py:94
 msgid "Dummy python step {}"
-msgstr "Dummy python step {}"
+msgstr ""
 
 #: src/modules/localecfg/main.py:30
 msgid "Configuring locales."
-msgstr "Configuring locales."
+msgstr ""
 
 #: src/modules/networkcfg/main.py:28
 msgid "Saving network configuration."
-msgstr "Saving network configuration."
+msgstr ""
diff --git a/src/modules/dummypythonqt/lang/dummypythonqt.pot b/src/modules/dummypythonqt/lang/dummypythonqt.pot
index b1665e503..e3a5ff33d 100644
--- a/src/modules/dummypythonqt/lang/dummypythonqt.pot
+++ b/src/modules/dummypythonqt/lang/dummypythonqt.pot
@@ -2,41 +2,41 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-10-15 12:53+0200\n"
+"POT-Creation-Date: 2020-11-09 15:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 #: src/modules/dummypythonqt/main.py:75
 msgid "Click me!"
-msgstr "Click me!"
+msgstr ""
 
 #: src/modules/dummypythonqt/main.py:85
 msgid "A new QLabel."
-msgstr "A new QLabel."
+msgstr ""
 
 #: src/modules/dummypythonqt/main.py:88
 msgid "Dummy PythonQt ViewStep"
-msgstr "Dummy PythonQt ViewStep"
+msgstr ""
 
 #: src/modules/dummypythonqt/main.py:174
 msgid "The Dummy PythonQt Job"
-msgstr "The Dummy PythonQt Job"
+msgstr ""
 
 #: src/modules/dummypythonqt/main.py:177
 msgid "This is the Dummy PythonQt Job. The dummy job says: {}"
-msgstr "This is the Dummy PythonQt Job. The dummy job says: {}"
+msgstr ""
 
 #: src/modules/dummypythonqt/main.py:181
 msgid "A status message for Dummy PythonQt Job."
-msgstr "A status message for Dummy PythonQt Job."
+msgstr ""

From f3e37f3ceef19b3eccdf74b73f47f4834763512d Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Nov 2020 15:40:23 +0100
Subject: [PATCH 215/228] [users] Remove unused PWQuality method

---
 src/modules/users/CheckPWQuality.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/modules/users/CheckPWQuality.cpp b/src/modules/users/CheckPWQuality.cpp
index 44e35b1f5..3800c00e8 100644
--- a/src/modules/users/CheckPWQuality.cpp
+++ b/src/modules/users/CheckPWQuality.cpp
@@ -122,8 +122,6 @@ public:
         return r;
     }
 
-    bool hasExplanation() const { return m_rv < 0; }
-
     /* This is roughly the same as the function pwquality_strerror,
      * only with QStrings instead, and using the Qt translation scheme.
      * It is used under the terms of the GNU GPL v3 or later, as

From 43565027f587c777ab60a6f50c090283c557b252 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Nov 2020 15:42:22 +0100
Subject: [PATCH 216/228] [users] m_auxerror never set, always nullptr

---
 src/modules/users/CheckPWQuality.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/modules/users/CheckPWQuality.cpp b/src/modules/users/CheckPWQuality.cpp
index 3800c00e8..fe6a49b2f 100644
--- a/src/modules/users/CheckPWQuality.cpp
+++ b/src/modules/users/CheckPWQuality.cpp
@@ -104,7 +104,6 @@ public:
 
     PWSettingsHolder()
         : m_settings( pwquality_default_settings() )
-        , m_auxerror( nullptr )
     {
     }
 
@@ -129,8 +128,7 @@ public:
      */
     QString explanation()
     {
-        void* auxerror = m_auxerror;
-        m_auxerror = nullptr;
+        void* auxerror = nullptr;
 
         if ( m_rv >= arbitrary_minimum_strength )
         {
@@ -308,7 +306,6 @@ public:
 private:
     pwquality_settings_t* m_settings;
     int m_rv;
-    void* m_auxerror;
 };
 
 DEFINE_CHECK_FUNC( libpwquality )

From b4c3236e4ad71a2dfc034f2dc19b051a56ffc26c Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Mon, 9 Nov 2020 16:08:19 +0100
Subject: [PATCH 217/228] [users] Consume error information from libpwquality

Previously, the auxerror information was never stored, and
the messages were all un-numbered or un-explained.
Now, consume that information and store it when check()
is called, ready to be used when (possibly much later,
or after a translation change) explanation() is called.
---
 src/modules/users/CheckPWQuality.cpp | 154 ++++++++++++++++-----------
 1 file changed, 94 insertions(+), 60 deletions(-)

diff --git a/src/modules/users/CheckPWQuality.cpp b/src/modules/users/CheckPWQuality.cpp
index fe6a49b2f..8dfea1f79 100644
--- a/src/modules/users/CheckPWQuality.cpp
+++ b/src/modules/users/CheckPWQuality.cpp
@@ -112,24 +112,73 @@ public:
     /// Sets an option via the configuration string @p v, <key>=<value> style.
     int set( const QString& v ) { return pwquality_set_option( m_settings, v.toUtf8().constData() ); }
 
-    /// Checks the given password @p pwd against the current configuration
+    /** @brief Checks the given password @p pwd against the current configuration
+     *
+     * Resets m_errorString and m_errorCount and then sets them appropriately
+     * so that explanation() can be called afterwards. Sets m_rv as well.
+     */
+
     int check( const QString& pwd )
     {
         void* auxerror = nullptr;
-        int r = pwquality_check( m_settings, pwd.toUtf8().constData(), nullptr, nullptr, &auxerror );
-        m_rv = r;
-        return r;
+        m_rv = pwquality_check( m_settings, pwd.toUtf8().constData(), nullptr, nullptr, &auxerror );
+
+        // Positive return values could be ignored; some negative ones
+        // place extra information in auxerror, which is a void* and
+        // which needs interpretation to long- or string-values.
+        m_errorCount = 0;
+        m_errorString = QString();
+
+        switch ( m_rv )
+        {
+        case PWQ_ERROR_CRACKLIB_CHECK:
+            if ( auxerror )
+            {
+                /* Here the string comes from cracklib, don't free? */
+                m_errorString = mungeString( auxerror );
+            }
+            break;
+        case PWQ_ERROR_MEM_ALLOC:
+        case PWQ_ERROR_UNKNOWN_SETTING:
+        case PWQ_ERROR_INTEGER:
+        case PWQ_ERROR_NON_INT_SETTING:
+        case PWQ_ERROR_NON_STR_SETTING:
+            if ( auxerror )
+            {
+                m_errorString = mungeString( auxerror );
+                free( auxerror );
+            }
+            break;
+        case PWQ_ERROR_MIN_DIGITS:
+        case PWQ_ERROR_MIN_UPPERS:
+        case PWQ_ERROR_MIN_LOWERS:
+        case PWQ_ERROR_MIN_OTHERS:
+        case PWQ_ERROR_MIN_LENGTH:
+        case PWQ_ERROR_MIN_CLASSES:
+        case PWQ_ERROR_MAX_CONSECUTIVE:
+        case PWQ_ERROR_MAX_CLASS_REPEAT:
+        case PWQ_ERROR_MAX_SEQUENCE:
+            if ( auxerror )
+            {
+                m_errorCount = mungeLong( auxerror );
+            }
+            break;
+        default:
+            break;
+        }
+
+        return m_rv;
     }
 
-    /* This is roughly the same as the function pwquality_strerror,
+    /** @brief Explain the results of the last call to check()
+     *
+     * This is roughly the same as the function pwquality_strerror,
      * only with QStrings instead, and using the Qt translation scheme.
      * It is used under the terms of the GNU GPL v3 or later, as
      * allowed by the libpwquality license (LICENSES/GPLv2+-libpwquality)
      */
     QString explanation()
     {
-        void* auxerror = nullptr;
-
         if ( m_rv >= arbitrary_minimum_strength )
         {
             return QString();
@@ -142,12 +191,10 @@ public:
         switch ( m_rv )
         {
         case PWQ_ERROR_MEM_ALLOC:
-            if ( auxerror )
+            if ( !m_errorString.isEmpty() )
             {
-                QString s = QCoreApplication::translate( "PWQ", "Memory allocation error when setting '%1'" )
-                                .arg( mungeString( auxerror ) );
-                free( auxerror );
-                return s;
+                return QCoreApplication::translate( "PWQ", "Memory allocation error when setting '%1'" )
+                    .arg( m_errorString );
             }
             return QCoreApplication::translate( "PWQ", "Memory allocation error" );
         case PWQ_ERROR_SAME_PASSWORD:
@@ -166,79 +213,75 @@ public:
         case PWQ_ERROR_BAD_WORDS:
             return QCoreApplication::translate( "PWQ", "The password contains forbidden words in some form" );
         case PWQ_ERROR_MIN_DIGITS:
-            if ( auxerror )
+            if ( m_errorCount )
             {
                 return QCoreApplication::translate(
-                    "PWQ", "The password contains fewer than %n digits", nullptr, mungeLong( auxerror ) );
+                    "PWQ", "The password contains fewer than %n digits", nullptr, m_errorCount );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too few digits" );
         case PWQ_ERROR_MIN_UPPERS:
-            if ( auxerror )
+            if ( m_errorCount )
             {
                 return QCoreApplication::translate(
-                    "PWQ", "The password contains fewer than %n uppercase letters", nullptr, mungeLong( auxerror ) );
+                    "PWQ", "The password contains fewer than %n uppercase letters", nullptr, m_errorCount );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too few uppercase letters" );
         case PWQ_ERROR_MIN_LOWERS:
-            if ( auxerror )
+            if ( m_errorCount )
             {
                 return QCoreApplication::translate(
-                    "PWQ", "The password contains fewer  than %n lowercase letters", nullptr, mungeLong( auxerror ) );
+                    "PWQ", "The password contains fewer  than %n lowercase letters", nullptr, m_errorCount );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too few lowercase letters" );
         case PWQ_ERROR_MIN_OTHERS:
-            if ( auxerror )
+            if ( m_errorCount )
             {
-                return QCoreApplication::translate( "PWQ",
-                                                    "The password contains fewer than %n non-alphanumeric characters",
-                                                    nullptr,
-                                                    mungeLong( auxerror ) );
+                return QCoreApplication::translate(
+                    "PWQ", "The password contains fewer than %n non-alphanumeric characters", nullptr, m_errorCount );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too few non-alphanumeric characters" );
         case PWQ_ERROR_MIN_LENGTH:
-            if ( auxerror )
+            if ( m_errorCount )
             {
                 return QCoreApplication::translate(
-                    "PWQ", "The password is shorter than %n characters", nullptr, mungeLong( auxerror ) );
+                    "PWQ", "The password is shorter than %n characters", nullptr, m_errorCount );
             }
             return QCoreApplication::translate( "PWQ", "The password is too short" );
         case PWQ_ERROR_ROTATED:
             return QCoreApplication::translate( "PWQ", "The password is a rotated version of the previous one" );
         case PWQ_ERROR_MIN_CLASSES:
-            if ( auxerror )
+            if ( m_errorCount )
             {
                 return QCoreApplication::translate(
-                    "PWQ", "The password contains fewer than %n character classes", nullptr, mungeLong( auxerror ) );
+                    "PWQ", "The password contains fewer than %n character classes", nullptr, m_errorCount );
             }
             return QCoreApplication::translate( "PWQ", "The password does not contain enough character classes" );
         case PWQ_ERROR_MAX_CONSECUTIVE:
-            if ( auxerror )
+            if ( m_errorCount )
             {
-                return QCoreApplication::translate( "PWQ",
-                                                    "The password contains more than %n same characters consecutively",
-                                                    nullptr,
-                                                    mungeLong( auxerror ) );
+                return QCoreApplication::translate(
+                    "PWQ", "The password contains more than %n same characters consecutively", nullptr, m_errorCount );
             }
             return QCoreApplication::translate( "PWQ", "The password contains too many same characters consecutively" );
         case PWQ_ERROR_MAX_CLASS_REPEAT:
-            if ( auxerror )
+            if ( m_errorCount )
             {
                 return QCoreApplication::translate(
                     "PWQ",
                     "The password contains more than %n characters of the same class consecutively",
                     nullptr,
-                    mungeLong( auxerror ) );
+                    m_errorCount );
             }
             return QCoreApplication::translate(
                 "PWQ", "The password contains too many characters of the same class consecutively" );
         case PWQ_ERROR_MAX_SEQUENCE:
-            if ( auxerror )
+            if ( m_errorCount )
             {
                 return QCoreApplication::translate(
                     "PWQ",
                     "The password contains monotonic sequence longer than %n characters",
                     nullptr,
-                    mungeLong( auxerror ) );
+                    m_errorCount );
             }
             return QCoreApplication::translate( "PWQ",
                                                 "The password contains too long of a monotonic character sequence" );
@@ -250,46 +293,34 @@ public:
             return QCoreApplication::translate( "PWQ",
                                                 "Password generation failed - required entropy too low for settings" );
         case PWQ_ERROR_CRACKLIB_CHECK:
-            if ( auxerror )
+            if ( !m_errorString.isEmpty() )
             {
-                /* Here the string comes from cracklib, don't free? */
                 return QCoreApplication::translate( "PWQ", "The password fails the dictionary check - %1" )
-                    .arg( mungeString( auxerror ) );
+                    .arg( m_errorString );
             }
             return QCoreApplication::translate( "PWQ", "The password fails the dictionary check" );
         case PWQ_ERROR_UNKNOWN_SETTING:
-            if ( auxerror )
+            if ( !m_errorString.isEmpty() )
             {
-                QString s = QCoreApplication::translate( "PWQ", "Unknown setting - %1" ).arg( mungeString( auxerror ) );
-                free( auxerror );
-                return s;
+                return QCoreApplication::translate( "PWQ", "Unknown setting - %1" ).arg( m_errorString );
             }
             return QCoreApplication::translate( "PWQ", "Unknown setting" );
         case PWQ_ERROR_INTEGER:
-            if ( auxerror )
+            if ( !m_errorString.isEmpty() )
             {
-                QString s = QCoreApplication::translate( "PWQ", "Bad integer value of setting - %1" )
-                                .arg( mungeString( auxerror ) );
-                free( auxerror );
-                return s;
+                return QCoreApplication::translate( "PWQ", "Bad integer value of setting - %1" ).arg( m_errorString );
             }
             return QCoreApplication::translate( "PWQ", "Bad integer value" );
         case PWQ_ERROR_NON_INT_SETTING:
-            if ( auxerror )
+            if ( !m_errorString.isEmpty() )
             {
-                QString s = QCoreApplication::translate( "PWQ", "Setting %1 is not of integer type" )
-                                .arg( mungeString( auxerror ) );
-                free( auxerror );
-                return s;
+                return QCoreApplication::translate( "PWQ", "Setting %1 is not of integer type" ).arg( m_errorString );
             }
             return QCoreApplication::translate( "PWQ", "Setting is not of integer type" );
         case PWQ_ERROR_NON_STR_SETTING:
-            if ( auxerror )
+            if ( !m_errorString.isEmpty() )
             {
-                QString s = QCoreApplication::translate( "PWQ", "Setting %1 is not of string type" )
-                                .arg( mungeString( auxerror ) );
-                free( auxerror );
-                return s;
+                return QCoreApplication::translate( "PWQ", "Setting %1 is not of string type" ).arg( m_errorString );
             }
             return QCoreApplication::translate( "PWQ", "Setting is not of string type" );
         case PWQ_ERROR_CFGFILE_OPEN:
@@ -304,8 +335,11 @@ public:
     }
 
 private:
-    pwquality_settings_t* m_settings;
-    int m_rv;
+    QString m_errorString;  ///< Textual error from last call to check()
+    int m_errorCount = 0;  ///< Count (used in %n) error from last call to check()
+    int m_rv = 0;  ///< Return value from libpwquality
+
+    pwquality_settings_t* m_settings = nullptr;
 };
 
 DEFINE_CHECK_FUNC( libpwquality )

From d5e678157defbe60ed9c822ebea93342e0770c31 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 10 Nov 2020 01:23:10 +0300
Subject: [PATCH 218/228] Changed TRANSLITERATOR_ID type to array

---
 src/modules/users/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index e94116bd7..b85ba67bd 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -28,7 +28,7 @@
 #include <unicode/unistr.h>
 
 //Did my best choosing compound ID
-static const char* TRANSLITERATOR_ID = "Russian-Latin/BGN;"
+static const char TRANSLITERATOR_ID[] = "Russian-Latin/BGN;"
                                        "Greek-Latin/UNGEGN;"
                                        "Any-Latin;"
                                        "Latin-ASCII";

From da5fb2d3e1923f11166ddbba7f699e019c028271 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 10 Nov 2020 01:40:08 +0300
Subject: [PATCH 219/228] Improved comment

---
 src/modules/users/Config.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index b85ba67bd..b0af2d5c8 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -27,11 +27,12 @@
 #include <unicode/translit.h>
 #include <unicode/unistr.h>
 
-//Did my best choosing compound ID
+//Needed for ICU to apply some transliteration ruleset.
+//Still needs to be adjusted to fit the needs of the most of users
 static const char TRANSLITERATOR_ID[] = "Russian-Latin/BGN;"
-                                       "Greek-Latin/UNGEGN;"
-                                       "Any-Latin;"
-                                       "Latin-ASCII";
+                                        "Greek-Latin/UNGEGN;"
+                                        "Any-Latin;"
+                                        "Latin-ASCII";
 #endif
 
 static const QRegExp USERNAME_RX( "^[a-z_][a-z0-9_-]*[$]?$" );

From ca033583a4cac43ed507be286ba3399895643406 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 10 Nov 2020 01:47:07 +0300
Subject: [PATCH 220/228] Simplified logic a bit, made punctuation handling
 more correct

---
 src/modules/users/Config.cpp | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index b0af2d5c8..37cd990d1 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -307,12 +307,15 @@ transliterate( const QString& input )
         return input;
     }
 
-    auto transliterable = icu::UnicodeString( input.utf16() );
-
+    icu::UnicodeString transliterable( input.utf16() );
     transliterator->transliterate( transliterable );
-
     return QString::fromUtf16( transliterable.getTerminatedBuffer() );
-
+}
+#else
+static QString
+transliterate( const QString& input )
+{
+    return input;
 }
 #endif
 
@@ -374,13 +377,8 @@ Config::setFullName( const QString& name )
 
         // Build login and hostname, if needed
         static QRegExp rx( "[^a-zA-Z0-9 ]", Qt::CaseInsensitive );
-#ifdef HAVE_ICU
-        QString cleanName = transliterate(name);
-        cleanName.replace("'", "");
-#else
-        QString cleanName = name;
-#endif
-        cleanName = CalamaresUtils::removeDiacritics( cleanName ).replace( rx, " " ).toLower().simplified();
+
+        QString cleanName = CalamaresUtils::removeDiacritics( transliterate( name ) ).replace( QRegExp( "[-']" ), "").replace( rx, " " ).toLower().simplified();
 
 
         QStringList cleanParts = cleanName.split( ' ' );

From 16eca3c1bee66fd071663e55f362d72101ff84b9 Mon Sep 17 00:00:00 2001
From: Artem Grinev <agrinev98@gmail.com>
Date: Tue, 10 Nov 2020 01:54:21 +0300
Subject: [PATCH 221/228] [users] Apply code format

---
 src/modules/users/Config.cpp | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp
index 37cd990d1..eb9832d70 100644
--- a/src/modules/users/Config.cpp
+++ b/src/modules/users/Config.cpp
@@ -97,7 +97,7 @@ Config::Config( QObject* parent )
     connect( this, &Config::requireStrongPasswordsChanged, this, &Config::checkReady );
 }
 
-Config::~Config() {}
+Config::~Config() { }
 
 void
 Config::setUserShell( const QString& shell )
@@ -297,10 +297,10 @@ transliterate( const QString& input )
 {
     static auto ue = UErrorCode::U_ZERO_ERROR;
     static auto transliterator = std::unique_ptr< icu::Transliterator >(
-                icu::Transliterator::createInstance( TRANSLITERATOR_ID, UTRANS_FORWARD, ue )
-                );
+        icu::Transliterator::createInstance( TRANSLITERATOR_ID, UTRANS_FORWARD, ue ) );
 
-    if( ue != UErrorCode::U_ZERO_ERROR ){
+    if ( ue != UErrorCode::U_ZERO_ERROR )
+    {
         cWarning() << "Can't create transliterator";
 
         //it'll be checked later for non-ASCII characters
@@ -378,7 +378,11 @@ Config::setFullName( const QString& name )
         // Build login and hostname, if needed
         static QRegExp rx( "[^a-zA-Z0-9 ]", Qt::CaseInsensitive );
 
-        QString cleanName = CalamaresUtils::removeDiacritics( transliterate( name ) ).replace( QRegExp( "[-']" ), "").replace( rx, " " ).toLower().simplified();
+        QString cleanName = CalamaresUtils::removeDiacritics( transliterate( name ) )
+                                .replace( QRegExp( "[-']" ), "" )
+                                .replace( rx, " " )
+                                .toLower()
+                                .simplified();
 
 
         QStringList cleanParts = cleanName.split( ' ' );

From 3069f4133fa38aa36a02c902111594b857dedaab Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Tue, 10 Nov 2020 12:08:49 +0100
Subject: [PATCH 222/228] Changes: post-release housekeeping

---
 CHANGES        | 16 ++++++++++++++++
 CMakeLists.txt |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1083f4ad2..a9b179e6b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,6 +7,22 @@ contributors are listed. Note that Calamares does not have a historical
 changelog -- this log starts with version 3.2.0. The release notes on the
 website will have to do for older versions.
 
+# 3.2.34 (unreleased) #
+
+This release contains contributions from (alphabetically by first name):
+ - Artem Grinev
+
+## Core ##
+ - No core changes yet
+
+## Modules ##
+ - In the *users* module, warnings about the strength of the password
+   are now correctly pluralized when possible.
+ - In the *users* module, if ICU is installed, the user's full name is
+   automatically transliterated to US-ASCII (for some locales; this will
+   need tweaking) so that the login name is acceptable. (Thanks Artem)
+
+
 # 3.2.33 (2020-11-09) #
 
 This release contains contributions from (alphabetically by first name):
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96bd0a9ec..fbd9d9432 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,10 +41,10 @@
 # TODO:3.3: Require CMake 3.12
 cmake_minimum_required( VERSION 3.3 FATAL_ERROR )
 project( CALAMARES
-    VERSION 3.2.33
+    VERSION 3.2.34
     LANGUAGES C CXX )
 
-set( CALAMARES_VERSION_RC 0 )  # Set to 0 during release cycle, 1 during development
+set( CALAMARES_VERSION_RC 1 )  # Set to 0 during release cycle, 1 during development
 
 ### OPTIONS
 #

From 8f590848bde053e0e2eaca492222b9537e5a4e56 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 11 Nov 2020 12:45:19 +0100
Subject: [PATCH 223/228] [plasmalnf] Simplify code

- Look-and-Feel job has no status to speak of
- Coding style
---
 src/modules/plasmalnf/PlasmaLnfJob.cpp | 17 ++++-------------
 src/modules/plasmalnf/PlasmaLnfJob.h   |  1 -
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/modules/plasmalnf/PlasmaLnfJob.cpp b/src/modules/plasmalnf/PlasmaLnfJob.cpp
index 0721bcd88..7ffe3aff7 100644
--- a/src/modules/plasmalnf/PlasmaLnfJob.cpp
+++ b/src/modules/plasmalnf/PlasmaLnfJob.cpp
@@ -20,30 +20,19 @@ PlasmaLnfJob::PlasmaLnfJob( const QString& lnfPath, const QString& id )
 {
 }
 
-
 PlasmaLnfJob::~PlasmaLnfJob() {}
 
-
 QString
 PlasmaLnfJob::prettyName() const
 {
     return tr( "Plasma Look-and-Feel Job" );
 }
 
-QString
-PlasmaLnfJob::prettyStatusMessage() const
-{
-    return prettyName();
-}
-
-
 Calamares::JobResult
 PlasmaLnfJob::exec()
 {
-    cDebug() << "Plasma Look-and-Feel Job";
-
-    auto system = CalamaresUtils::System::instance();
-    Calamares::GlobalStorage* gs = Calamares::JobQueue::instance()->globalStorage();
+    auto* system = CalamaresUtils::System::instance();
+    auto* gs = Calamares::JobQueue::instance()->globalStorage();
 
     QStringList command( { "sudo",
                            "-E",
@@ -59,8 +48,10 @@ PlasmaLnfJob::exec()
 
     int r = system->targetEnvCall( command );
     if ( r )
+    {
         return Calamares::JobResult::error( tr( "Could not select KDE Plasma Look-and-Feel package" ),
                                             tr( "Could not select KDE Plasma Look-and-Feel package" ) );
+    }
 
     return Calamares::JobResult::ok();
 }
diff --git a/src/modules/plasmalnf/PlasmaLnfJob.h b/src/modules/plasmalnf/PlasmaLnfJob.h
index 83360434e..4eaf81014 100644
--- a/src/modules/plasmalnf/PlasmaLnfJob.h
+++ b/src/modules/plasmalnf/PlasmaLnfJob.h
@@ -24,7 +24,6 @@ public:
     ~PlasmaLnfJob() override;
 
     QString prettyName() const override;
-    QString prettyStatusMessage() const override;
 
     Calamares::JobResult exec() override;
 

From 76b09819184c2a1a2c31b9cec148b1400bb5dd43 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 11 Nov 2020 12:57:40 +0100
Subject: [PATCH 224/228] [plasmalnf] Apply workaround for lookandfeeltool

The lookandfeeltool does not (always?) write the LookAndFeelPackage
key that the KCM does -- and which this module reads on startup
to find the default LnF. This seems to be a regression in recent
lookandfeeltool versions (or in the KCM code that backs it).

Workaround supplied by jghodd.

Fixes #1573
---
 src/modules/plasmalnf/PlasmaLnfJob.cpp | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/modules/plasmalnf/PlasmaLnfJob.cpp b/src/modules/plasmalnf/PlasmaLnfJob.cpp
index 7ffe3aff7..3b550d50a 100644
--- a/src/modules/plasmalnf/PlasmaLnfJob.cpp
+++ b/src/modules/plasmalnf/PlasmaLnfJob.cpp
@@ -14,6 +14,11 @@
 #include "utils/CalamaresUtilsSystem.h"
 #include "utils/Logger.h"
 
+#ifdef WITH_KCONFIG
+#include <KConfigGroup>
+#include <KSharedConfig>
+#endif
+
 PlasmaLnfJob::PlasmaLnfJob( const QString& lnfPath, const QString& id )
     : m_lnfPath( lnfPath )
     , m_id( id )
@@ -53,5 +58,15 @@ PlasmaLnfJob::exec()
                                             tr( "Could not select KDE Plasma Look-and-Feel package" ) );
     }
 
+#ifdef WITH_KCONFIG
+    // This is a workaround for lookandfeeltool **not** writing
+    // the LookAndFeelPackage key in kdeglobals; this happens
+    // with the lnftool and Plasma 5.20 (possibly other combinations
+    // as well).
+    QString targetConfig = system->targetPath( "/home/" + gs->value( "username" ).toString() + "/.config/kdeglobals" );
+    KConfigGroup cg( KSharedConfig::openConfig( targetConfig ), "KDE" );
+    cg.writeEntry( "LookAndFeelPackage", m_id );
+#endif
+
     return Calamares::JobResult::ok();
 }

From a8359696caf07b81b85db8acad2d3f44720d07fa Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Wed, 11 Nov 2020 13:06:09 +0100
Subject: [PATCH 225/228] [plasmalnf] Remove unnecessary includes

---
 src/modules/plasmalnf/PlasmaLnfViewStep.h | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/modules/plasmalnf/PlasmaLnfViewStep.h b/src/modules/plasmalnf/PlasmaLnfViewStep.h
index 46c24c970..74de803c9 100644
--- a/src/modules/plasmalnf/PlasmaLnfViewStep.h
+++ b/src/modules/plasmalnf/PlasmaLnfViewStep.h
@@ -14,10 +14,6 @@
 #include "utils/PluginFactory.h"
 #include "viewpages/ViewStep.h"
 
-#include <QObject>
-#include <QUrl>
-#include <QVariantMap>
-
 class PlasmaLnfPage;
 
 class PLUGINDLLEXPORT PlasmaLnfViewStep : public Calamares::ViewStep

From 2e6d632c7cc9958323870c3da25d129140d016b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
Date: Wed, 11 Nov 2020 12:44:41 -0500
Subject: [PATCH 226/228] [partition] Fix typo

---
 src/modules/partition/core/Config.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/partition/core/Config.cpp b/src/modules/partition/core/Config.cpp
index 55e0d8d0a..0afcee83d 100644
--- a/src/modules/partition/core/Config.cpp
+++ b/src/modules/partition/core/Config.cpp
@@ -190,7 +190,7 @@ Config::setSwapChoice( int c )
 {
     if ( ( c < SwapChoice::NoSwap ) || ( c > SwapChoice::SwapFile ) )
     {
-        cWarning() << "Instalid swap choice (int)" << c;
+        cWarning() << "Invalid swap choice (int)" << c;
         c = SwapChoice::NoSwap;
     }
     setSwapChoice( static_cast< SwapChoice >( c ) );

From fdfe3937e92531a5911734c67d7fffbe6d364b76 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 12 Nov 2020 14:50:21 +0100
Subject: [PATCH 227/228] [keyboard] Tell the keyboard preview to update on
 config changes

These calls to setLayout() and setVariant() got lost in
the transition to Config object, in 5afe5413.

Reported by Harald Sitter.
---
 src/modules/keyboard/KeyboardLayoutModel.cpp | 10 ++++++++
 src/modules/keyboard/KeyboardLayoutModel.h   |  7 ++++++
 src/modules/keyboard/KeyboardPage.cpp        | 25 ++++++++++++--------
 3 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 8b5906699..8a7664d97 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -198,6 +198,16 @@ KeyboardLayoutModel::item( const int& index ) const
     return m_layouts.at( index );
 }
 
+QString
+KeyboardLayoutModel::key( int index ) const
+{
+    if ( index >= m_layouts.count() || index < 0 )
+    {
+        return QString();
+    }
+    return m_layouts.at( index ).first;
+}
+
 void
 KeyboardLayoutModel::init()
 {
diff --git a/src/modules/keyboard/KeyboardLayoutModel.h b/src/modules/keyboard/KeyboardLayoutModel.h
index 99b204573..c2306c001 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.h
+++ b/src/modules/keyboard/KeyboardLayoutModel.h
@@ -118,6 +118,13 @@ public:
     int currentIndex() const;
     const QPair< QString, KeyboardGlobal::KeyboardInfo > item( const int& index ) const;
 
+    /** @brief xkb key for a given index (row)
+     *
+     * This is like calling data( QModelIndex( index ), KeyboardLayoutKeyRole ).toString(),
+     * but shorter and faster. Can return an empty string if index is invalid.
+     */
+    QString key( int index ) const;
+
 protected:
     QHash< int, QByteArray > roleNames() const override;
 
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index 7522056a3..e69ee579f 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -70,8 +70,9 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
         cDebug() << "Variants now" << model->rowCount() << model->currentIndex();
     }
 
-    connect(
-        ui->buttonRestore, &QPushButton::clicked, [config = config] { config->keyboardModels()->setCurrentIndex(); } );
+    connect( ui->buttonRestore, &QPushButton::clicked, [ config = config ] {
+        config->keyboardModels()->setCurrentIndex();
+    } );
 
     connect( ui->physicalModelSelector,
              QOverload< int >::of( &QComboBox::currentIndexChanged ),
@@ -82,18 +83,22 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
              ui->physicalModelSelector,
              &QComboBox::setCurrentIndex );
 
-    connect( ui->layoutSelector->selectionModel(),
-             &QItemSelectionModel::currentChanged,
-             [this]( const QModelIndex& current ) { m_config->keyboardLayouts()->setCurrentIndex( current.row() ); } );
-    connect( config->keyboardLayouts(), &KeyboardLayoutModel::currentIndexChanged, [this]( int index ) {
+    connect(
+        ui->layoutSelector->selectionModel(),
+        &QItemSelectionModel::currentChanged,
+        [ this ]( const QModelIndex& current ) { m_config->keyboardLayouts()->setCurrentIndex( current.row() ); } );
+    connect( config->keyboardLayouts(), &KeyboardLayoutModel::currentIndexChanged, [ this ]( int index ) {
         ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) );
+        m_keyboardPreview->setLayout( m_config->keyboardLayouts()->key( index ) );
     } );
 
-    connect( ui->variantSelector->selectionModel(),
-             &QItemSelectionModel::currentChanged,
-             [this]( const QModelIndex& current ) { m_config->keyboardVariants()->setCurrentIndex( current.row() ); } );
-    connect( config->keyboardVariants(), &KeyboardVariantsModel::currentIndexChanged, [this]( int index ) {
+    connect(
+        ui->variantSelector->selectionModel(),
+        &QItemSelectionModel::currentChanged,
+        [ this ]( const QModelIndex& current ) { m_config->keyboardVariants()->setCurrentIndex( current.row() ); } );
+    connect( config->keyboardVariants(), &KeyboardVariantsModel::currentIndexChanged, [ this ]( int index ) {
         ui->variantSelector->setCurrentIndex( m_config->keyboardVariants()->index( index ) );
+        m_keyboardPreview->setVariant( m_config->keyboardVariants()->key( index ) );
     } );
     CALAMARES_RETRANSLATE_SLOT( &KeyboardPage::retranslate )
 }

From 03e09cb7e6d07bee0e49495571bb4579bad1dda8 Mon Sep 17 00:00:00 2001
From: Adriaan de Groot <groot@kde.org>
Date: Thu, 12 Nov 2020 15:29:15 +0100
Subject: [PATCH 228/228] [keyboard] When changing layouts, reset variant

- Need to update the variant that is in use, **and**
  explicitly update it in the widget, in order to re-load
  the keyboard image for the newly-selected layout+variant.
---
 src/modules/keyboard/KeyboardLayoutModel.cpp | 1 +
 src/modules/keyboard/KeyboardPage.cpp        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/modules/keyboard/KeyboardLayoutModel.cpp b/src/modules/keyboard/KeyboardLayoutModel.cpp
index 8a7664d97..34a1dec88 100644
--- a/src/modules/keyboard/KeyboardLayoutModel.cpp
+++ b/src/modules/keyboard/KeyboardLayoutModel.cpp
@@ -269,5 +269,6 @@ KeyboardVariantsModel::setVariants( QMap< QString, QString > variants )
     {
         m_list << ModelInfo { variants[ key ], key };
     }
+    m_currentIndex = -1;
     endResetModel();
 }
diff --git a/src/modules/keyboard/KeyboardPage.cpp b/src/modules/keyboard/KeyboardPage.cpp
index e69ee579f..5044d9bb6 100644
--- a/src/modules/keyboard/KeyboardPage.cpp
+++ b/src/modules/keyboard/KeyboardPage.cpp
@@ -90,6 +90,7 @@ KeyboardPage::KeyboardPage( Config* config, QWidget* parent )
     connect( config->keyboardLayouts(), &KeyboardLayoutModel::currentIndexChanged, [ this ]( int index ) {
         ui->layoutSelector->setCurrentIndex( m_config->keyboardLayouts()->index( index ) );
         m_keyboardPreview->setLayout( m_config->keyboardLayouts()->key( index ) );
+        m_keyboardPreview->setVariant( m_config->keyboardVariants()->key( m_config->keyboardVariants()->currentIndex() ) );
     } );
 
     connect(