summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-04-23 19:22:25 -0400
committerGitHub <noreply@github.com>2020-04-23 19:22:25 -0400
commit4e3b190ac7e8fc8d87cda6832a623296afd1b90e (patch)
treead0a74770e31310134d3c39198f4675326a14df6
parent35601b6bef6165e254aa0becc38939f1122b0181 (diff)
parent58933654391c699951b322a153bcc3a85bf40552 (diff)
Merge pull request #173 from Nheko-Reborn/decrypt-sidebar
Decrypt sidebar setting added to user settings
-rw-r--r--.gitignore4
-rw-r--r--CHANGELOG.md3
-rw-r--r--resources/langs/nheko_de.ts19
-rw-r--r--resources/langs/nheko_el.ts19
-rw-r--r--resources/langs/nheko_en.ts19
-rw-r--r--resources/langs/nheko_fi.ts19
-rw-r--r--resources/langs/nheko_fr.ts19
-rw-r--r--resources/langs/nheko_ja.ts19
-rw-r--r--resources/langs/nheko_nl.ts19
-rw-r--r--resources/langs/nheko_pl.ts19
-rw-r--r--resources/langs/nheko_ru.ts19
-rw-r--r--resources/langs/nheko_zh_CN.ts19
-rw-r--r--src/ChatPage.h1
-rw-r--r--src/MainWindow.cpp4
-rw-r--r--src/Olm.cpp2
-rw-r--r--src/UserSettingsPage.cpp11
-rw-r--r--src/UserSettingsPage.h10
-rw-r--r--src/Utils.cpp5
-rw-r--r--src/Utils.h1
-rw-r--r--src/timeline/TimelineModel.cpp26
-rw-r--r--src/timeline/TimelineModel.h4
-rw-r--r--src/timeline/TimelineViewManager.cpp21
-rw-r--r--src/timeline/TimelineViewManager.h1
23 files changed, 197 insertions, 86 deletions
diff --git a/.gitignore b/.gitignore
index 6d178679..5f6725db 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ cscope*
/.ccls-cache
/.exrc
.gdb_history
+.hunter
# GTAGS
GTAGS
@@ -70,7 +71,8 @@ install_manifest.txt
.LSOverride
# Icon must end with two \r
-Icon
+Icon
+
# Thumbnails
._*
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93a4d9d7..d9670fa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,8 +10,9 @@
- Fix display of images sent by the user (thank you, wnereiz and not-chicken for reporting)
- Fix crash when trying to maximize image, that wasn't downloaded yet.
-- Fix Binding restorMode flooding logs on Qt 5.14.2+
+- Fix Binding restoreMode flooding logs on Qt 5.14.2+
- Fix with some qml styles hidden menu items leave empty space
+- Fix encrypted messages not showing a user in the sidebar
- Fix hangs when generating colors with some system theme color schemes (#172)
## [0.7.0] -- 2020-04-19
diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index 259b5c86..a97c3fb3 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -471,7 +471,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- Entschlüsselungsfehler (Fehler bei Kommunikation mit Datenbank) --</translation>
@@ -779,7 +779,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>Ins Benachrichtigungsfeld minimieren</translation>
</message>
@@ -800,6 +800,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation>Entschlüssele Nachrichten in der Raumliste</translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
@@ -859,7 +864,7 @@
<translation>Gerätefingerabdruck</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-59"/>
<source>Session Keys</source>
<translation>Sitzungsschlüssel</translation>
</message>
@@ -879,22 +884,22 @@
<translation>VERSCHLÜSSELUNG</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>GENERAL</source>
<translation>ALLGEMEINES</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>INTERFACE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+108"/>
<source>Emoji Font Family</source>
<translation>Emojischriftart</translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+158"/>
<source>Open Sessions File</source>
<translation>Öffne Sessions Datei</translation>
</message>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index 4ce7e6e4..1f4c355c 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -471,7 +471,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -779,7 +779,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>Ελαχιστοποίηση</translation>
</message>
@@ -800,6 +800,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
@@ -859,7 +864,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-59"/>
<source>Session Keys</source>
<translation type="unfinished"></translation>
</message>
@@ -879,22 +884,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>GENERAL</source>
<translation>ΓΕΝΙΚΑ</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>INTERFACE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+108"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+158"/>
<source>Open Sessions File</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index f7b3b093..52eb4a4c 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -471,7 +471,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- Decryption Error (failed to communicate with DB) --</translation>
@@ -779,7 +779,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>Minimize to tray</translation>
</message>
@@ -800,6 +800,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Show buttons in timeline</source>
<translation>Show buttons in timeline</translation>
</message>
@@ -859,7 +864,7 @@
<translation>Device Fingerprint</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-59"/>
<source>Session Keys</source>
<translation>Session Keys</translation>
</message>
@@ -879,22 +884,22 @@
<translation>ENCRYPTION</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>GENERAL</source>
<translation>GENERAL</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>INTERFACE</source>
<translation>INTERFACE</translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+108"/>
<source>Emoji Font Family</source>
<translation>Emoji Font Family</translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+158"/>
<source>Open Sessions File</source>
<translation>Open Sessions File</translation>
</message>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index eab4771b..3ab797d8 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -471,7 +471,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished">-- Virhe purkaessa salausta (tietokannan kanssa kommunikointi epäonnistui) --</translation>
@@ -779,7 +779,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>Pienennä ilmoitusalueelle</translation>
</message>
@@ -800,6 +800,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
@@ -859,7 +864,7 @@
<translation>Laitteen sormenjälki</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-59"/>
<source>Session Keys</source>
<translation>Istunnon avaimet</translation>
</message>
@@ -879,22 +884,22 @@
<translation>SALAUS</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>GENERAL</source>
<translation>YLEISET ASETUKSET</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>INTERFACE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+108"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+158"/>
<source>Open Sessions File</source>
<translation>Avaa Istuntoavaintiedosto</translation>
</message>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index 472f8c7f..f90ff8c0 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -472,7 +472,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -780,7 +780,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>Réduire à la barre des tâches</translation>
</message>
@@ -801,6 +801,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
@@ -860,7 +865,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-59"/>
<source>Session Keys</source>
<translation type="unfinished"></translation>
</message>
@@ -880,22 +885,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>GENERAL</source>
<translation>GÉNÉRAL</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>INTERFACE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+108"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+158"/>
<source>Open Sessions File</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
index d3194b42..884ca357 100644
--- a/resources/langs/nheko_ja.ts
+++ b/resources/langs/nheko_ja.ts
@@ -471,7 +471,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- 復号エラー (データベースと通信できませんでした) --</translation>
@@ -778,7 +778,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>トレイへ最小化</translation>
</message>
@@ -799,6 +799,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
@@ -858,7 +863,7 @@
<translation>デバイスの指紋</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-59"/>
<source>Session Keys</source>
<translation>セッション鍵</translation>
</message>
@@ -878,22 +883,22 @@
<translation>暗号化</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>GENERAL</source>
<translation>全般</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>INTERFACE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+108"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+158"/>
<source>Open Sessions File</source>
<translation>セッションファイルを開く</translation>
</message>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index cb4f68e8..88b25e7f 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -471,7 +471,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -779,7 +779,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>Minimaliseren naar systeemvak</translation>
</message>
@@ -800,6 +800,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
@@ -859,7 +864,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-59"/>
<source>Session Keys</source>
<translation type="unfinished"></translation>
</message>
@@ -879,22 +884,22 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>GENERAL</source>
<translation>ALGEMEEN</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>INTERFACE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+108"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+158"/>
<source>Open Sessions File</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index 9fb3bae6..749e172b 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -471,7 +471,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -780,7 +780,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>Zminimalizuj do paska zadań</translation>
</message>
@@ -801,6 +801,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
@@ -860,7 +865,7 @@
<translation>Odcisk palca urządzenia</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-59"/>
<source>Session Keys</source>
<translation type="unfinished"></translation>
</message>
@@ -880,22 +885,22 @@
<translation>SZYFROWANIE</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>GENERAL</source>
<translation>OGÓLNE</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>INTERFACE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+108"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+158"/>
<source>Open Sessions File</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index f48fccf3..05240613 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -471,7 +471,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -780,7 +780,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>Сворачивать в системную панель</translation>
</message>
@@ -801,6 +801,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
@@ -860,7 +865,7 @@
<translation>Отпечаток устройства</translation>
</message>
<message>
- <location line="-58"/>
+ <location line="-59"/>
<source>Session Keys</source>
<translation>Ключи сеанса</translation>
</message>
@@ -880,22 +885,22 @@
<translation>ШИФРОВАНИЕ</translation>
</message>
<message>
- <location line="-62"/>
+ <location line="-63"/>
<source>GENERAL</source>
<translation>ГЛАВНОЕ</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>INTERFACE</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+107"/>
+ <location line="+108"/>
<source>Emoji Font Family</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+152"/>
+ <location line="+158"/>
<source>Open Sessions File</source>
<translation>Открыть файл сеансов</translation>
</message>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index 63b67734..b6fe6d1d 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -471,7 +471,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+754"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+766"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -778,7 +778,7 @@
<context>
<name>UserSettingsPage</name>
<message>
- <location filename="../../src/UserSettingsPage.cpp" line="+333"/>
+ <location filename="../../src/UserSettingsPage.cpp" line="+335"/>
<source>Minimize to tray</source>
<translation>最小化至托盘</translation>
</message>
@@ -799,6 +799,11 @@
</message>
<message>
<location line="+2"/>
+ <source>Decrypt messages in sidebar</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>