Merge branch 'v1.5-development'

UI / translations update
Nitrokey · Aug 14, 2021 · 55303eb · 55303eb
2 parents 00b97f7 + f206796
commit 55303eb
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 8 deletions.
diff --git a/i18n/nitrokey_arabic.qm → i18n/nitrokey_Arabic.qm b/i18n/nitrokey_arabic.qm → i18n/nitrokey_Arabic.qm
diff --git a/i18n/nitrokey_arabic.ts → i18n/nitrokey_Arabic.ts b/i18n/nitrokey_arabic.ts → i18n/nitrokey_Arabic.ts
diff --git a/i18n/nitrokey_de_DE.qm → i18n/nitrokey_Deutsch.qm b/i18n/nitrokey_de_DE.qm → i18n/nitrokey_Deutsch.qm
diff --git a/i18n/nitrokey_de_DE.ts → i18n/nitrokey_Deutsch.ts b/i18n/nitrokey_de_DE.ts → i18n/nitrokey_Deutsch.ts
diff --git a/i18n/nitrokey_en.qm → i18n/nitrokey_English.qm b/i18n/nitrokey_en.qm → i18n/nitrokey_English.qm
diff --git a/i18n/nitrokey_en.ts → i18n/nitrokey_English.ts b/i18n/nitrokey_en.ts → i18n/nitrokey_English.ts
diff --git a/i18n/nitrokey_fr.qm → i18n/nitrokey_Francais.qm b/i18n/nitrokey_fr.qm → i18n/nitrokey_Francais.qm
diff --git a/i18n/nitrokey_fr.ts → i18n/nitrokey_Francais.ts b/i18n/nitrokey_fr.ts → i18n/nitrokey_Francais.ts
diff --git a/i18n/nitrokey_it.qm → i18n/nitrokey_Italiano.qm b/i18n/nitrokey_it.qm → i18n/nitrokey_Italiano.qm
diff --git a/i18n/nitrokey_it.ts → i18n/nitrokey_Italiano.ts b/i18n/nitrokey_it.ts → i18n/nitrokey_Italiano.ts
diff --git a/i18n/nitrokey_pl.qm → i18n/nitrokey_Polski.qm b/i18n/nitrokey_pl.qm → i18n/nitrokey_Polski.qm
diff --git a/i18n/nitrokey_pl.ts → i18n/nitrokey_Polski.ts b/i18n/nitrokey_pl.ts → i18n/nitrokey_Polski.ts
diff --git 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>

diff --git 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.")},
 });