Merge branch '0.7.0-dev' of github.com:Nheko-Reborn/nheko into 0.7.0-dev

Fix merge conflicts with weblate translation files.

1 files changed, 1 insertions, 1 deletions

diff --git a/src/dialogs/UserProfile.cpp b/src/dialogs/UserProfile.cpp

index b8040f9f..6aea96a8 100644
--- a/src/dialogs/UserProfile.cpp
+++ b/src/dialogs/UserProfile.cpp
@@ -183,7 +183,7 @@ UserProfile::UserProfile(QWidget *parent)
 
         qRegisterMetaType<std::vector<DeviceInfo>>();
 
-        auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
+        auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
         connect(closeShortcut, &QShortcut::activated, this, &UserProfile::close);
         connect(okBtn, &QPushButton::clicked, this, &UserProfile::close);
 }