diff --git a/resources/qml/Root.qml b/resources/qml/Root.qml
index dd1dfe1e04f145ca8368558fe1d5de612091e397..3bc4c59b3cf551a13e6b8b88c3518e3906b63f9b 100644
--- a/resources/qml/Root.qml
+++ b/resources/qml/Root.qml
@@ -431,7 +431,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 3367f181e962e5f5948db9a22de15e9094fd0dfe..187c32465112a358b845fe6710015df8bfa6745e 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 120924a2bd69c7570183ea2f8a256a97db7ecb21..a07aadd2b61dc903cdd867192f12540ff2a47dd0 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 d6668b867d42224015360a615b85d4bb1673ed41..bfc6d79719f18649c0cce0d60c2f9346c1936f29 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 33a6f6fa1a8b931f1c67fffada2acd03440eac6c..f6c296f8869ee1d046d2da1d8668b7cf3233d7d3 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 46036242b14c69e24547ee20f64b64081cde2e59..8261ca604e922aa13c63ce31b4f59ded37a74aa0 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 2b2f56bd9434e91a5944cfb8d3db67eb3f69717d..4cdd98c1c627e24c2f1f3ba1e39a143078921080 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 e123489bcb5de97097dc9501454c0cc867502a6c..617df237ccdb7f7c808470832a15966f4b96dece 100644
--- a/src/ChatPage.cpp
+++ b/src/ChatPage.cpp
@@ -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 b647a73c842d26936d7a7c414465f19e8aa87ec0..75c08203066f45268b7e58d547cdab39cb941bf6 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 1ba39627e4e96ea5c4cf0816266f205e09e6b68d..9c07bd89dd4d2323b411d351d317e6042169e81e 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 e85d38c1c2d193333b12dfc33b41b58045747308..5969be0dc67114f0f46d566b91b30cbd2d1cb37c 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/main.cpp b/src/main.cpp
index defa5c88b2d12bb4296a21930adc266011ae8837..83b4657adad0f14df591e306e8f1502c8885972d 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 34568385c038b3e691fc6836926f821bba0d1979..d18de0b736bbd1f34d0cb189c296b1b2e582243e 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -1971,7 +1971,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: {