summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--resources/qml/Root.qml2
-rw-r--r--resources/qml/device-verification/NewVerificationRequest.qml4
-rw-r--r--resources/qml/dialogs/ConfirmJoinRoomDialog.qml2
-rw-r--r--resources/qml/dialogs/CreateRoom.qml2
-rw-r--r--resources/qml/dialogs/RoomSettings.qml2
-rw-r--r--resources/qml/pages/LoginPage.qml6
-rw-r--r--resources/qml/pages/RegisterPage.qml2
-rw-r--r--src/ChatPage.cpp8
-rw-r--r--src/RegisterPage.cpp2
-rw-r--r--src/UserSettingsPage.cpp6
-rw-r--r--src/dialogs/FallbackAuth.cpp2
-rw-r--r--src/dialogs/ReCaptcha.cpp4
-rw-r--r--src/main.cpp2
-rw-r--r--src/timeline/TimelineModel.cpp2
14 files changed, 23 insertions, 23 deletions
diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml
index ce24ec39..1f079213 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -281,7 +281,7 @@ Pane {
         id: uiaTokenPrompt
 
         title: UIA.title
-        prompt: qsTr("Please enter the token, which has been sent to you:")
+        prompt: qsTr("Please enter the token which has been sent to you:")
         onAccepted: (t) => {
             return UIA.submit3pidToken(t);
         }
diff --git a/resources/qml/device-verification/NewVerificationRequest.qml b/resources/qml/device-verification/NewVerificationRequest.qml
index 3367f181..187c3246 100644
--- a/resources/qml/device-verification/NewVerificationRequest.qml
+++ b/resources/qml/device-verification/NewVerificationRequest.qml
@@ -23,9 +23,9 @@ ColumnLayout {
             if (flow.sender) {
                 if (flow.isSelfVerification)
                     if (flow.isMultiDeviceVerification)
-                        return qsTr("To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)");
+                        return qsTr("To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify an unverified device now? (Please make sure you have one of those devices available.)");
                     else
-                        return qsTr("To allow other users to see, which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?").arg(flow.deviceId);
+                        return qsTr("To allow other users to see which of your devices actually belong to you, you can verify them. This also allows key backup to work automatically. Verify %1 now?").arg(flow.deviceId);
                 else
                     return qsTr("To ensure that no malicious user can eavesdrop on your encrypted communications you can verify the other party.");
             } else {
diff --git a/resources/qml/dialogs/ConfirmJoinRoomDialog.qml b/resources/qml/dialogs/ConfirmJoinRoomDialog.qml
index 120924a2..a07aadd2 100644
--- a/resources/qml/dialogs/ConfirmJoinRoomDialog.qml
+++ b/resources/qml/dialogs/ConfirmJoinRoomDialog.qml
@@ -109,7 +109,7 @@ ApplicationWindow {
         Label {
             id: promptLabel
 
-            text: summary.isKnockOnly ? qsTr("This room can't be joined directly. You can however knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:") : qsTr("Do you want to join this room? You can optionally add a reason below:")
+            text: summary.isKnockOnly ? qsTr("This room can't be joined directly. You can, however, knock on the room and room members can accept or decline this join request. You can additionally provide a reason for them to let you in below:") : qsTr("Do you want to join this room? You can optionally add a reason below:")
             color: Nheko.colors.text
             Layout.fillWidth: true
             horizontalAlignment: Text.AlignHCenter
diff --git a/resources/qml/dialogs/CreateRoom.qml b/resources/qml/dialogs/CreateRoom.qml
index d6668b86..bfc6d797 100644
--- a/resources/qml/dialogs/CreateRoom.qml
+++ b/resources/qml/dialogs/CreateRoom.qml
@@ -88,7 +88,7 @@ ApplicationWindow {
                 id: privateHover
             }
             ToolTip.visible: privateHover.hovered
-            ToolTip.text: qsTr("Public rooms can be joined by anyone, private rooms need explicit invites.")
+            ToolTip.text: qsTr("Public rooms can be joined by anyone; private rooms need explicit invites.")
             ToolTip.delay: Nheko.tooltipDelay
         }
         ToggleButton {
diff --git a/resources/qml/dialogs/RoomSettings.qml b/resources/qml/dialogs/RoomSettings.qml
index 33a6f6fa..f6c296f8 100644
--- a/resources/qml/dialogs/RoomSettings.qml
+++ b/resources/qml/dialogs/RoomSettings.qml
@@ -451,7 +451,7 @@ ApplicationWindow {
 
                 Button {
                     text: qsTr("Change")
-                    ToolTip.text: qsTr("Change what packs are enabled, remove packs or create new ones")
+                    ToolTip.text: qsTr("Change what packs are enabled, remove packs, or create new ones")
                     onClicked: TimelineManager.openImagePackSettings(roomSettings.roomId)
                     Layout.alignment: Qt.AlignRight
                 }
diff --git a/resources/qml/pages/LoginPage.qml b/resources/qml/pages/LoginPage.qml
index 46036242..8261ca60 100644
--- a/resources/qml/pages/LoginPage.qml
+++ b/resources/qml/pages/LoginPage.qml
@@ -60,7 +60,7 @@ Item {
                     placeholderText: qsTr("e.g @joe:matrix.org")
                     onEditingFinished: login.mxid = text
 
-                    ToolTip.text: qsTr("Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :.\nYou can also put your homeserver address there, if your server doesn't support .well-known lookup.\nExample: @user:server.my\nIf Nheko fails to discover your homeserver, it will show you a field to enter the server manually.")
+                    ToolTip.text: qsTr("Your login name. A mxid should start with @ followed by the user ID. After the user ID you need to include your server name after a :.\nYou can also put your homeserver address there if your server doesn't support .well-known lookup.\nExample: @user:server.my\nIf Nheko fails to discover your homeserver, it will show you a field to enter the server manually.")
                     Keys.forwardTo: [pwBtn, ssoRepeater]
                 }
 
@@ -99,7 +99,7 @@ Item {
                 Layout.fillWidth: true
                 label: qsTr("Device name")
                 placeholderText: login.initialDeviceName()
-                ToolTip.text: qsTr("A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.")
+                ToolTip.text: qsTr("A name for this device which will be shown to others when verifying your devices. If nothing is provided, a default is used.")
                 Keys.forwardTo: [pwBtn, ssoRepeater]
             }
 
@@ -113,7 +113,7 @@ Item {
                 placeholderText: qsTr("server.my:8787")
                 text: login.homeserver
                 onEditingFinished: login.homeserver = text
-                ToolTip.text: qsTr("The address that can be used to contact you homeservers client API.\nExample: https://server.my:8787")
+                ToolTip.text: qsTr("The address that can be used to contact you homeserver's client API.\nExample: https://server.my:8787")
                 Keys.forwardTo: [pwBtn, ssoRepeater]
             }
 
diff --git a/resources/qml/pages/RegisterPage.qml b/resources/qml/pages/RegisterPage.qml
index 2b2f56bd..4cdd98c1 100644
--- a/resources/qml/pages/RegisterPage.qml
+++ b/resources/qml/pages/RegisterPage.qml
@@ -165,7 +165,7 @@ Item {
                 Layout.fillWidth: true
                 label: qsTr("Device name")
                 placeholderText: regis.initialDeviceName()
-                ToolTip.text: qsTr("A name for this device, which will be shown to others, when verifying your devices. If none is provided a default is used.")
+                ToolTip.text: qsTr("A name for this device which will be shown to others when verifying your devices. If nothing is provided a default is used.")
             }
 
             Item {
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: {
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-22 05:52:09 +0000