diff options
author | DeepBlueV7.X <nicolas.werner@hotmail.de> | 2022-03-02 22:21:59 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-02 22:21:59 +0000 |
commit | b42ca35089f97fad82330f6aabc0810feaade970 (patch) | |
tree | e6754a2fd7e0cf52110d26afd154b64d6073e02a | |
parent | Remove unused headers (diff) | |
parent | Remove extraneous comma (diff) | |
download | nheko-b42ca35089f97fad82330f6aabc0810feaade970.tar.xz |
Merge pull request #969 from ISSOtm/patch-1
Fix some minor text issues
-rw-r--r-- | resources/qml/dialogs/HiddenEventsDialog.qml | 4 | ||||
-rw-r--r-- | src/UserSettingsPage.cpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/resources/qml/dialogs/HiddenEventsDialog.qml b/resources/qml/dialogs/HiddenEventsDialog.qml index cc6f17a5..e0e79604 100644 --- a/resources/qml/dialogs/HiddenEventsDialog.qml +++ b/resources/qml/dialogs/HiddenEventsDialog.qml @@ -49,10 +49,10 @@ ApplicationWindow { id: promptLabel text: { if (roomid) { - return qsTr("These events will be be <b>shown</b> in %1:").arg(roomName); + return qsTr("These events will be <b>shown</b> in %1:").arg(roomName); } else { - return qsTr("These events will be be <b>shown</b> in all rooms:"); + return qsTr("These events will be <b>shown</b> in all rooms:"); } } font.pixelSize: Math.floor(fontMetrics.font.pixelSize * 1.2) diff --git a/src/UserSettingsPage.cpp b/src/UserSettingsPage.cpp index 862a70d0..c7ac790a 100644 --- a/src/UserSettingsPage.cpp +++ b/src/UserSettingsPage.cpp @@ -1110,14 +1110,14 @@ UserSettingsModel::data(const QModelIndex &index, int role) const case ReadReceipts: return tr("Show if your message was read.\nStatus is displayed next to timestamps."); case DesktopNotifications: - return tr("Notify about received message when the client is not currently focused."); + return tr("Notify about received messages when the client is not currently focused."); case AlertOnNotification: return tr( "Show an alert when a message is received.\nThis usually causes the application " "icon in the task bar to animate in some fashion."); case AvatarCircles: return tr( - "Change the appearance of user avatars in chats.\nOFF - square, ON - Circle."); + "Change the appearance of user avatars in chats.\nOFF - square, ON - circle."); case UseIdenticon: return tr("Display an identicon instead of a letter when no avatar is set."); case DecryptSidebar: @@ -1170,7 +1170,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const case SelfSigningKey: return tr( "The key to verify your own devices. If it is cached, verifying one of your devices " - "will mark it verified for all your other devices and for users, that have verified " + "will mark it verified for all your other devices and for users that have verified " "you."); case UserSigningKey: return tr( |