From b5ec07610da4f5935b09da6f28dcadc8dfe09163 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Sat, 14 Aug 2021 12:32:33 +0200
Subject: [PATCH 1/2] Change language file names

---
 i18n/{nitrokey_arabic.qm => nitrokey_Arabic.qm} | Bin
 i18n/{nitrokey_arabic.ts => nitrokey_Arabic.ts} |   0
 i18n/{nitrokey_de_DE.qm => nitrokey_Deutsch.qm} | Bin
 i18n/{nitrokey_de_DE.ts => nitrokey_Deutsch.ts} |   0
 i18n/{nitrokey_en.qm => nitrokey_English.qm}    | Bin
 i18n/{nitrokey_en.ts => nitrokey_English.ts}    |   0
 i18n/{nitrokey_fr.qm => nitrokey_Francais.qm}   | Bin
 i18n/{nitrokey_fr.ts => nitrokey_Francais.ts}   |   0
 i18n/{nitrokey_it.qm => nitrokey_Italiano.qm}   | Bin
 i18n/{nitrokey_it.ts => nitrokey_Italiano.ts}   |   0
 i18n/{nitrokey_pl.qm => nitrokey_Polski.qm}     | Bin
 i18n/{nitrokey_pl.ts => nitrokey_Polski.ts}     |   0
 resources.qrc                                   |  12 ++++++------
 13 files changed, 6 insertions(+), 6 deletions(-)
 rename i18n/{nitrokey_arabic.qm => nitrokey_Arabic.qm} (100%)
 rename i18n/{nitrokey_arabic.ts => nitrokey_Arabic.ts} (100%)
 rename i18n/{nitrokey_de_DE.qm => nitrokey_Deutsch.qm} (100%)
 rename i18n/{nitrokey_de_DE.ts => nitrokey_Deutsch.ts} (100%)
 rename i18n/{nitrokey_en.qm => nitrokey_English.qm} (100%)
 rename i18n/{nitrokey_en.ts => nitrokey_English.ts} (100%)
 rename i18n/{nitrokey_fr.qm => nitrokey_Francais.qm} (100%)
 rename i18n/{nitrokey_fr.ts => nitrokey_Francais.ts} (100%)
 rename i18n/{nitrokey_it.qm => nitrokey_Italiano.qm} (100%)
 rename i18n/{nitrokey_it.ts => nitrokey_Italiano.ts} (100%)
 rename i18n/{nitrokey_pl.qm => nitrokey_Polski.qm} (100%)
 rename i18n/{nitrokey_pl.ts => nitrokey_Polski.ts} (100%)

diff --git a/i18n/nitrokey_arabic.qm b/i18n/nitrokey_Arabic.qm
similarity index 100%
rename from i18n/nitrokey_arabic.qm
rename to i18n/nitrokey_Arabic.qm
diff --git a/i18n/nitrokey_arabic.ts b/i18n/nitrokey_Arabic.ts
similarity index 100%
rename from i18n/nitrokey_arabic.ts
rename to i18n/nitrokey_Arabic.ts
diff --git a/i18n/nitrokey_de_DE.qm b/i18n/nitrokey_Deutsch.qm
similarity index 100%
rename from i18n/nitrokey_de_DE.qm
rename to i18n/nitrokey_Deutsch.qm
diff --git a/i18n/nitrokey_de_DE.ts b/i18n/nitrokey_Deutsch.ts
similarity index 100%
rename from i18n/nitrokey_de_DE.ts
rename to i18n/nitrokey_Deutsch.ts
diff --git a/i18n/nitrokey_en.qm b/i18n/nitrokey_English.qm
similarity index 100%
rename from i18n/nitrokey_en.qm
rename to i18n/nitrokey_English.qm
diff --git a/i18n/nitrokey_en.ts b/i18n/nitrokey_English.ts
similarity index 100%
rename from i18n/nitrokey_en.ts
rename to i18n/nitrokey_English.ts
diff --git a/i18n/nitrokey_fr.qm b/i18n/nitrokey_Francais.qm
similarity index 100%
rename from i18n/nitrokey_fr.qm
rename to i18n/nitrokey_Francais.qm
diff --git a/i18n/nitrokey_fr.ts b/i18n/nitrokey_Francais.ts
similarity index 100%
rename from i18n/nitrokey_fr.ts
rename to i18n/nitrokey_Francais.ts
diff --git a/i18n/nitrokey_it.qm b/i18n/nitrokey_Italiano.qm
similarity index 100%
rename from i18n/nitrokey_it.qm
rename to i18n/nitrokey_Italiano.qm
diff --git a/i18n/nitrokey_it.ts b/i18n/nitrokey_Italiano.ts
similarity index 100%
rename from i18n/nitrokey_it.ts
rename to i18n/nitrokey_Italiano.ts
diff --git a/i18n/nitrokey_pl.qm b/i18n/nitrokey_Polski.qm
similarity index 100%
rename from i18n/nitrokey_pl.qm
rename to i18n/nitrokey_Polski.qm
diff --git a/i18n/nitrokey_pl.ts b/i18n/nitrokey_Polski.ts
similarity index 100%
rename from i18n/nitrokey_pl.ts
rename to i18n/nitrokey_Polski.ts
diff --git a/resources.qrc b/resources.qrc
index 5dc461ca..4a183916 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -4,12 +4,12 @@
         <file alias="progressWheel2.gif">images/progressWheel2.gif</file>
     </qresource>
     <qresource prefix="/i18n">
-        <file alias="nitrokey_de_DE.qm">i18n/nitrokey_de_DE.qm</file>
-        <file alias="nitrokey_en.qm">i18n/nitrokey_en.qm</file>
-        <file alias="nitrokey_arabic.qm">i18n/nitrokey_arabic.qm</file>
-        <file alias="nitrokey_fr.qm">i18n/nitrokey_fr.qm</file>
-        <file alias="nitrokey_pl.qm">i18n/nitrokey_pl.qm</file>
-        <file alias="nitrokey_it.qm">i18n/nitrokey_it.qm</file>
+        <file alias="nitrokey_Deutsch.qm">i18n/nitrokey_Deutsch.qm</file>
+        <file alias="nitrokey_English.qm">i18n/nitrokey_English.qm</file>
+        <file alias="nitrokey_Arabic.qm">i18n/nitrokey_Arabic.qm</file>
+        <file alias="nitrokey_Francais.qm">i18n/nitrokey_Francais.qm</file>
+        <file alias="nitrokey_Polski.qm">i18n/nitrokey_Polski.qm</file>
+        <file alias="nitrokey_Italiano.qm">i18n/nitrokey_Italiano.qm</file>
     </qresource>
     <qresource prefix="/license">
         <file alias="General">3RDPARTY.txt</file>

From ef500c227da9d8c2a051b3b87e44c8fbc505a8a6 Mon Sep 17 00:00:00 2001
From: Szczepan Zalega <szczepan@nitrokey.com>
Date: Sat, 14 Aug 2021 12:38:37 +0200
Subject: [PATCH 2/2] Set English as the new default ts file

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

diff --git a/src/main.cpp b/src/main.cpp
index 1df42ac4..aa11c46f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -192,7 +192,7 @@ void configureTranslator(const QApplication &a, const QCommandLineParser &parser
         QString(settings_language),
         QString(QLocale::system().name()),
         QString(lang.toLower()),
-        QString("en"),
+        QString("English"),
     };
 
     if (parser.isSet("debug")) {
@@ -298,7 +298,7 @@ bool configureParser(const QApplication &a, QCommandLineParser &parser) {
           QCoreApplication::translate("main",
                                       "Load translation file with given name "
                                       "and store this choice in settings file."),
-          "en"},
+                                      "English"},
       {"no-window",
           QCoreApplication::translate("main", "Display no window.")},
 });