Skip to content

Commit 55303eb

Browse files
committed
Merge branch 'v1.5-development'
UI / translations update
2 parents 00b97f7 + f206796 commit 55303eb

14 files changed

+8
-8
lines changed
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

resources.qrc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
<file alias="progressWheel2.gif">images/progressWheel2.gif</file>
55
</qresource>
66
<qresource prefix="/i18n">
7-
<file alias="nitrokey_de_DE.qm">i18n/nitrokey_de_DE.qm</file>
8-
<file alias="nitrokey_en.qm">i18n/nitrokey_en.qm</file>
9-
<file alias="nitrokey_arabic.qm">i18n/nitrokey_arabic.qm</file>
10-
<file alias="nitrokey_fr.qm">i18n/nitrokey_fr.qm</file>
11-
<file alias="nitrokey_pl.qm">i18n/nitrokey_pl.qm</file>
12-
<file alias="nitrokey_it.qm">i18n/nitrokey_it.qm</file>
7+
<file alias="nitrokey_Deutsch.qm">i18n/nitrokey_Deutsch.qm</file>
8+
<file alias="nitrokey_English.qm">i18n/nitrokey_English.qm</file>
9+
<file alias="nitrokey_Arabic.qm">i18n/nitrokey_Arabic.qm</file>
10+
<file alias="nitrokey_Francais.qm">i18n/nitrokey_Francais.qm</file>
11+
<file alias="nitrokey_Polski.qm">i18n/nitrokey_Polski.qm</file>
12+
<file alias="nitrokey_Italiano.qm">i18n/nitrokey_Italiano.qm</file>
1313
</qresource>
1414
<qresource prefix="/license">
1515
<file alias="General">3RDPARTY.txt</file>

src/main.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ void configureTranslator(const QApplication &a, const QCommandLineParser &parser
192192
QString(settings_language),
193193
QString(QLocale::system().name()),
194194
QString(lang.toLower()),
195-
QString("en"),
195+
QString("English"),
196196
};
197197

198198
if (parser.isSet("debug")) {
@@ -298,7 +298,7 @@ bool configureParser(const QApplication &a, QCommandLineParser &parser) {
298298
QCoreApplication::translate("main",
299299
"Load translation file with given name "
300300
"and store this choice in settings file."),
301-
"en"},
301+
"English"},
302302
{"no-window",
303303
QCoreApplication::translate("main", "Display no window.")},
304304
});

0 commit comments

Comments
 (0)