From c76ebe4fe2cbc5baf144b7f663433e6ee165680b Mon Sep 17 00:00:00 2001
From: miruka <miruka@disroot.org>
Date: Fri, 16 Aug 2019 09:47:44 -0400
Subject: [PATCH] Improve some texts

---
 README.md                                | 6 +++---
 TODO.md                                  | 1 +
 src/python/models/items.py               | 1 -
 src/qml/Pages/EditAccount/Encryption.qml | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index dcc50a52..c337d0e3 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Qt 5.12+, including:
 
 - olm-python3 >= 3.1
 
-[pyotherside](https://github.com/thp/pyotherside):
+Install [pyotherside](https://github.com/thp/pyotherside):
 
     git clone https://github.com/thp/pyotherside
     cd pyotherside
@@ -25,13 +25,13 @@ After this, verify the permissions of the installed plugin files.
     sudo chmod 644 /usr/lib/qt5/qml/io/thp/pyotherside/*
     sudo chmod 755 /usr/lib/qt5/qml/io/thp/pyotherside/*.so
 
-Dependencies on Pypi:
+Install the dependencies from Pypi:
 
     pip3 install --user --upgrade \
         Pillow aiofiles dataclasses filetype hsluv html_sanitizer \
         lxml mistune uvloop
 
-Dependencies on Github (most recent version needed):
+Install the dependencies from Github:
 
 [matrix-nio](https://github.com/mirukan/matrix-nio):
 
diff --git a/TODO.md b/TODO.md
index 7432e8c7..d1ea0bb0 100644
--- a/TODO.md
+++ b/TODO.md
@@ -11,6 +11,7 @@
   - When qml syntax highlighting supports ES6 string interpolation, use them
 
 - Fixes
+  - (Left?)Banner binding loop
   - Reloading config files (cache)
   - Ignore @ when filtering members
   - Tiny invisible scrollbar
diff --git a/src/python/models/items.py b/src/python/models/items.py
index 65f54928..398f74a8 100644
--- a/src/python/models/items.py
+++ b/src/python/models/items.py
@@ -112,7 +112,6 @@ class Event(ModelItem):
         # Local echoes always stay first.
         if self.is_local_echo and not other.is_local_echo:
             return True
-
         if other.is_local_echo and not self.is_local_echo:
             return False
 
diff --git a/src/qml/Pages/EditAccount/Encryption.qml b/src/qml/Pages/EditAccount/Encryption.qml
index 290a9b76..f3c61806 100644
--- a/src/qml/Pages/EditAccount/Encryption.qml
+++ b/src/qml/Pages/EditAccount/Encryption.qml
@@ -20,8 +20,8 @@ HColumnLayout {
     HLabel {
         wrapMode: Text.Wrap
         text: qsTr(
-            "The decryption keys for the messages you received in " +
-            "encrypted rooms can be exported to a file.%1" +
+            "The decryption keys for messages you received in encrypted " +
+            "rooms can be exported to a passphrase-protected file.%1" +
             "You will then be able to import this file in another " +
             "Matrix client."
         ).arg(pageStack.isWide ? "\n" :"\n\n")