Merge remote-tracking branch 'origin/master' into cross-signing

1 files changed, 1 insertions, 1 deletions

diff --git a/src/timeline/EventStore.cpp b/src/timeline/EventStore.cpp

index af1f7b23..298e0d18 100644
--- a/src/timeline/EventStore.cpp
+++ b/src/timeline/EventStore.cpp
@@ -573,7 +573,7 @@ EventStore::decryptEvent(const IdIndex &idx,
                           room_id_,
                           index.sender_key);
                         dummy.content.body =
-                          tr("-- Reply attack! This message index was reused! --").toStdString();
+                          tr("-- Replay attack! This message index was reused! --").toStdString();
                         break;
                 case olm::DecryptionErrorCode::UnknownFingerprint:
                         // TODO: don't fail, just show in UI.