Merge pull request #1202 from Nheko-Reborn/grammar

Grammar

7 files changed, 13 insertions, 13 deletions

diff --git a/src/ChatPage.cpp b/src/ChatPage.cpp
index 457b301e..d6b3d292 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -350,9 +350,9 @@ ChatPage::bootstrap(QString userid, QString homeserver, QString token)
                               tr("Cache migration failed!"),
                               tr("Migrating the cache to the current version failed. "
                                  "This can have different reasons. Please open an "
-                                 "issue and try to use an older version in the mean "
-                                 "time. Alternatively you can try deleting the cache "
-                                 "manually."));
+                                 "issue at https://github.com/Nheko-Reborn/nheko and try to use an "
+                                 "older version in the meantime. Alternatively you can try "
+                                 "deleting the cache manually."));
                             QCoreApplication::quit();
                         }
                         loadStateFromCache();
@@ -709,7 +709,7 @@ ChatPage::knockRoom(const QString &room,
           tr("Knock on room"),
           // clang-format off
       failedJoin
-        ? tr("You failed to join %1. You can try to knock, so that others can invite you in. Do you want to do so?\nYou may optionally provide a reason for others to accept your knock:").arg(room)
+        ? tr("You failed to join %1. You can try to knock so that others can invite you in. Do you want to do so?\nYou may optionally provide a reason for others to accept your knock:").arg(room)
         : tr("Do you really want to knock on %1? You may optionally provide a reason for others to accept your knock:").arg(room),
           // clang-format on
           QLineEdit::Normal,
diff --git a/src/RegisterPage.cpp b/src/RegisterPage.cpp
index b647a73c..75c08203 100644
--- a/src/RegisterPage.cpp
+++ b/src/RegisterPage.cpp
@@ -136,7 +136,7 @@ RegisterPage::versionsCheck()
                     return supported.count(v) != 0;
                 }) == versions.versions.cend()) {
               emit setHsError(
-                tr("The selected server does not support a version of the Matrix protocol, that "
+                tr("The selected server does not support a version of the Matrix protocol that "
                    "this client understands (v1.1, v1.2 or v1.3). You can't register."));
               emit hsErrorChanged();
               return;
diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp
index 86c02351..6569b4a0 100644
--- a/src/UserSettingsPage.cpp
+++ b/src/UserSettingsPage.cpp
@@ -1161,7 +1161,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
             return {};
         case TimelineMaxWidth:
             return tr("Set the max width of messages in the timeline (in pixels). This can help "
-                      "readability on wide screen, when Nheko is maximised");
+                      "readability on wide screen when Nheko is maximized");
         case PrivacyScreenTimeout:
             return tr(
               "Set timeout (in seconds) for how long after window loses\nfocus before the screen"
@@ -1201,7 +1201,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
               "be sorted by the timestamp of the last message in a room.\nIf this is on, rooms "
               "which "
               "have active notifications (the small circle with a number in it) will be sorted on "
-              "top. Rooms, that you have muted, will still be sorted by timestamp, since you don't "
+              "top. Rooms that you have muted will still be sorted by timestamp, since you don't "
               "seem to consider them as important as the other rooms.");
         case ButtonsInTimeline:
             return tr(
@@ -1251,7 +1251,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
                       "improves safety but makes E2EE more tedious.");
         case ShareKeysWithTrustedUsers:
             return tr(
-              "Automatically replies to key requests from other users, if they are verified, "
+              "Automatically replies to key requests from other users if they are verified, "
               "even if that device shouldn't have access to those keys otherwise.");
         case UseOnlineKeyBackup:
             return tr(
diff --git a/src/dialogs/FallbackAuth.cpp b/src/dialogs/FallbackAuth.cpp
index e85d38c1..5969be0d 100644
--- a/src/dialogs/FallbackAuth.cpp
+++ b/src/dialogs/FallbackAuth.cpp
@@ -49,7 +49,7 @@ FallbackAuth::FallbackAuth(const QString &authType, const QString &session, QWid
     font.setPointSizeF(font.pointSizeF() * conf::modals::LABEL_MEDIUM_SIZE_RATIO);
 
     auto label = new QLabel(
-      tr("Open the fallback, follow the steps and confirm after completing them."), this);
+      tr("Open the fallback, follow the steps, and confirm after completing them."), this);
     label->setFont(font);
 
     layout->addWidget(label);
diff --git a/src/dialogs/ReCaptcha.cpp b/src/dialogs/ReCaptcha.cpp
index 220596b7..95a1f85f 100644
--- a/src/dialogs/ReCaptcha.cpp
+++ b/src/dialogs/ReCaptcha.cpp
@@ -66,10 +66,10 @@ ReCaptcha::ReCaptcha(const QString &session, QWidget *parent)
 
     connect(confirmBtn_, &QPushButton::clicked, this, [this]() {
         emit confirmation();
-        emit close();
+        close();
     });
     connect(cancelBtn_, &QPushButton::clicked, this, [this]() {
         emit cancel();
-        emit close();
+        close();
     });
 }
diff --git a/src/main.cpp b/src/main.cpp
index defa5c88..83b4657a 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -227,7 +227,7 @@ main(int argc, char *argv[])
     // option and thereby crashing the app.
     QCommandLineOption configName(
       QStringList() << QStringLiteral("p") << QStringLiteral("profile"),
-      QCoreApplication::tr("Create a unique profile, which allows you to log into several "
+      QCoreApplication::tr("Create a unique profile which allows you to log into several "
                            "accounts at the same time and start multiple instances of nheko."),
       QCoreApplication::tr("profile"),
       QCoreApplication::tr("profile name"));
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index 7c718ca8..13ebd506 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1958,7 +1958,7 @@ TimelineModel::formatJoinRuleEvent(const QString &id)
     case mtx::events::state::JoinRule::Public:
         return tr("%1 opened the room to the public.").arg(name);
     case mtx::events::state::JoinRule::Invite:
-        return tr("%1 made this room require and invitation to join.").arg(name);
+        return tr("%1 made this room require an invitation to join.").arg(name);
     case mtx::events::state::JoinRule::Knock:
         return tr("%1 allowed to join this room by knocking.").arg(name);
     case mtx::events::state::JoinRule::Restricted: {