d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #969 from ISSOtm/patch-1

Browse source 
Fix some minor text issues
This commit is contained in:
DeepBlueV7.X 2022-03-02 22:21:59 +00:00 committed by GitHub
commit b42ca35089
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/qml/dialogs/HiddenEventsDialog.qml
View file

@ -49,10 +49,10 @@ ApplicationWindow {
id: promptLabel id: promptLabel
text: { text: {
if (roomid) { 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 { 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) font.pixelSize: Math.floor(fontMetrics.font.pixelSize * 1.2)

6
src/UserSettingsPage.cpp
View file

@ -1110,14 +1110,14 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
case ReadReceipts: case ReadReceipts:
return tr("Show if your message was read.\nStatus is displayed next to timestamps."); return tr("Show if your message was read.\nStatus is displayed next to timestamps.");
case DesktopNotifications: 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: case AlertOnNotification:
return tr( return tr(
"Show an alert when a message is received.\nThis usually causes the application " "Show an alert when a message is received.\nThis usually causes the application "
"icon in the task bar to animate in some fashion."); "icon in the task bar to animate in some fashion.");
case AvatarCircles: case AvatarCircles:
return tr( 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: case UseIdenticon:
return tr("Display an identicon instead of a letter when no avatar is set."); return tr("Display an identicon instead of a letter when no avatar is set.");
case DecryptSidebar: case DecryptSidebar:
@ -1170,7 +1170,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
case SelfSigningKey: case SelfSigningKey:
return tr( return tr(
"The key to verify your own devices. If it is cached, verifying one of your devices " "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."); "you.");
case UserSigningKey: case UserSigningKey:
return tr( return tr(