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, 2 insertions, 2 deletions

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

index f4167143..88a95403 100644
--- a/src/dialogs/MemberList.cpp
+++ b/src/dialogs/MemberList.cpp
@@ -97,7 +97,7 @@ MemberList::MemberList(const QString &room_id, QWidget *parent)
         topLabel_->setAlignment(Qt::AlignCenter);
         topLabel_->setFont(font);
 
-        auto okBtn = new QPushButton("OK", this);
+        auto okBtn = new QPushButton(tr("OK"), this);
 
         auto buttonLayout = new QHBoxLayout();
         buttonLayout->setSpacing(15);
@@ -126,7 +126,7 @@ MemberList::MemberList(const QString &room_id, QWidget *parent)
                 qCritical() << e.what();
         }
 
-        auto closeShortcut = new QShortcut(QKeySequence(tr("ESC")), this);
+        auto closeShortcut = new QShortcut(QKeySequence(QKeySequence::Cancel), this);
         connect(closeShortcut, &QShortcut::activated, this, &MemberList::close);
         connect(okBtn, &QPushButton::clicked, this, &MemberList::close);
 }