rnhmjoj/nheko
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Made merge compatible with master

Browse Source
This commit is contained in:
Emi Simpson 2020-03-15 12:16:01 -04:00
commit 6bbe8ade0f
No known key found for this signature in database
GPG Key ID: 68FAB2E2E6DFC98B
19 changed files with 687 additions and 571 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
io.github.NhekoReborn.Nheko.json
View File

@ -10,7 +10,6 @@
"rename-appdata-file": "nheko.appdata.xml", "rename-appdata-file": "nheko.appdata.xml",
"finish-args": [ "finish-args": [
"--device=dri", "--device=dri",
"--filesystem=home",
"--share=ipc", "--share=ipc",
"--share=network", "--share=network",
"--socket=pulseaudio", "--socket=pulseaudio",

118
resources/langs/nheko_de.ts
View File

@ -4,15 +4,15 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation type="unfinished"></translation> <translation>Nutzer konnte nicht eingeladen werden: %1</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation>Eingeladener Benutzer: %1</translation>
</message> </message>
<message> <message>
<location line="-5"/> <location line="-5"/>
@ -50,12 +50,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation> <translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation>Wiederherstellung des OLM Accounts fehlgeschlagen. Bitte logge dich erneut ein.</translation> <translation>Wiederherstellung des OLM Accounts fehlgeschlagen. Bitte logge dich erneut ein.</translation>
</message> </message>
@ -479,13 +479,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation>-- verschlüsselter Event (keine Schlüssel zur Entschlüsselung gefunden) --</translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <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> <translation>-- Entschlüsselungsfehler (Fehler bei Kommunikation mit Datenbank) --</translation>
@ -497,19 +491,7 @@
<translation>-- Entschlüsselungsfehler (Fehler bei Suche nach megolm Schlüsseln in Datenbank) --</translation> <translation>-- Entschlüsselungsfehler (Fehler bei Suche nach megolm Schlüsseln in Datenbank) --</translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation>-- Entschlüsselungsfehler (%1) --</translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation>-- verschlüsselter Event (Unbekannter Eventtyp) --</translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation>Nachricht zurückziehen fehlgeschlagen: %1</translation> <translation>Nachricht zurückziehen fehlgeschlagen: %1</translation>
</message> </message>
@ -533,9 +515,27 @@
<source>Save file</source> <source>Save file</source>
<translation>Datei speichern</translation> <translation>Datei speichern</translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished">-- Verschlüsseltes Event (keine Schlüssel zur Entschlüsselung gefunden) --</translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished">-- Entschlüsselungsfehler (%1) --</translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished">-- Verschlüsseltes Event (Unbekannter Eventtyp) --</translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation> <translation>
<numerusform>%1%2 tippt</numerusform> <numerusform>%1%2 tippt</numerusform>
@ -544,42 +544,42 @@
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -634,11 +634,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation>Hat die Verbannung von %1 zurückgezogen.</translation> <translation type="unfinished">Hat die Verbannung von %1 zurückgezogen.</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation>%1 hat das Anklopfen zurückgezogen.</translation> <translation>%1 hat das Anklopfen zurückgezogen.</translation>
</message> </message>
@ -654,12 +659,7 @@
<translation type="unfinished">%1 hat den Raum verlassen.</translation> <translation type="unfinished">%1 hat den Raum verlassen.</translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -672,7 +672,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation>Antworten</translation> <translation>Antworten</translation>
</message> </message>
@ -685,7 +685,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished">Antworten</translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation type="unfinished">Lesebestätigungen</translation> <translation type="unfinished">Lesebestätigungen</translation>
</message> </message>
@ -715,7 +720,7 @@
<translation>Kein Raum geöffnet</translation> <translation>Kein Raum geöffnet</translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished">Schließen</translation> <translation type="unfinished">Schließen</translation>
</message> </message>
@ -777,7 +782,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>Ins Benachrichtigungsfeld minimieren</translation> <translation>Ins Benachrichtigungsfeld minimieren</translation>
</message> </message>
@ -798,6 +803,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation>Schreibbenachrichtigungen</translation> <translation>Schreibbenachrichtigungen</translation>
</message> </message>
@ -847,7 +857,7 @@
<translation>Gerätefingerabdruck</translation> <translation>Gerätefingerabdruck</translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation>Sitzungsschlüssel</translation> <translation>Sitzungsschlüssel</translation>
</message> </message>
@ -867,22 +877,22 @@
<translation>VERSCHLÜSSELUNG</translation> <translation>VERSCHLÜSSELUNG</translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>ALLGEMEINES</translation> <translation>ALLGEMEINES</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation>Öffne Sessions Datei</translation> <translation>Öffne Sessions Datei</translation>
</message> </message>

112
resources/langs/nheko_el.ts
View File

@ -4,13 +4,13 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -50,12 +50,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -479,13 +479,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <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> <translation type="unfinished"></translation>
@ -497,19 +491,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -533,9 +515,27 @@
<source>Save file</source> <source>Save file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -544,42 +544,42 @@
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -634,11 +634,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -654,12 +659,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -672,7 +672,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -685,7 +685,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -715,7 +720,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -777,7 +782,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>Ελαχιστοποίηση</translation> <translation>Ελαχιστοποίηση</translation>
</message> </message>
@ -798,6 +803,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -847,7 +857,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -867,22 +877,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>ΓΕΝΙΚΑ</translation> <translation>ΓΕΝΙΚΑ</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

114
resources/langs/nheko_en.ts
View File

@ -4,13 +4,13 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation>Failed to invite user: %1</translation> <translation>Failed to invite user: %1</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation>Invited user: %1</translation> <translation>Invited user: %1</translation>
</message> </message>
@ -50,12 +50,12 @@
<translation>Unbanned user: %1</translation> <translation>Unbanned user: %1</translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation>Failed to upload media. Please try again.</translation> <translation>Failed to upload media. Please try again.</translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation>Failed to restore OLM account. Please login again.</translation> <translation>Failed to restore OLM account. Please login again.</translation>
</message> </message>
@ -479,13 +479,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation>-- Encrypted Event (No keys found for decryption) --</translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <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> <translation>-- Decryption Error (failed to communicate with DB) --</translation>
@ -497,19 +491,7 @@
<translation>-- Decryption Error (failed to retrieve megolm keys from db) --</translation> <translation>-- Decryption Error (failed to retrieve megolm keys from db) --</translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation>-- Decryption Error (%1) --</translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation>-- Encrypted Event (Unknown event type) --</translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation>Message redaction failed: %1</translation> <translation>Message redaction failed: %1</translation>
</message> </message>
@ -533,9 +515,27 @@
<source>Save file</source> <source>Save file</source>
<translation>Save file</translation> <translation>Save file</translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished">-- Encrypted Event (No keys found for decryption) --</translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished">-- Decryption Error (%1) --</translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished">-- Encrypted Event (Unknown event type) --</translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation> <translation>
<numerusform>%1%2 is typing</numerusform> <numerusform>%1%2 is typing</numerusform>
@ -544,42 +544,42 @@
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -634,11 +634,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation>Unbanned %1.</translation> <translation type="unfinished">Unbanned %1.</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation>%1 redacted their knock.</translation> <translation>%1 redacted their knock.</translation>
</message> </message>
@ -654,12 +659,7 @@
<translation type="unfinished">%1 left after having already left!</translation> <translation type="unfinished">%1 left after having already left!</translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -672,7 +672,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation>Reply</translation> <translation>Reply</translation>
</message> </message>
@ -685,7 +685,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished">Reply</translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation>Read receipts</translation> <translation>Read receipts</translation>
</message> </message>
@ -715,7 +720,7 @@
<translation>No room open</translation> <translation>No room open</translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation>Close</translation> <translation>Close</translation>
</message> </message>
@ -777,7 +782,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>Minimize to tray</translation> <translation>Minimize to tray</translation>
</message> </message>
@ -798,6 +803,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation>Typing notifications</translation> <translation>Typing notifications</translation>
</message> </message>
@ -847,7 +857,7 @@
<translation>Device Fingerprint</translation> <translation>Device Fingerprint</translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation>Session Keys</translation> <translation>Session Keys</translation>
</message> </message>
@ -867,22 +877,22 @@
<translation>ENCRYPTION</translation> <translation>ENCRYPTION</translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>GENERAL</translation> <translation>GENERAL</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation>Open Sessions File</translation> <translation>Open Sessions File</translation>
</message> </message>

114
resources/langs/nheko_fi.ts
View File

@ -4,13 +4,13 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -50,12 +50,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation>OLM-tilin palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen.</translation> <translation>OLM-tilin palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen.</translation>
</message> </message>
@ -479,13 +479,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished">-- Salattu viesti (salauksen purkuavaimia ei löydetty) --</translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <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> <translation type="unfinished">-- Virhe purkaessa salausta (tietokannan kanssa kommunikointi epäonnistui) --</translation>
@ -497,19 +491,7 @@
<translation type="unfinished">-- Virhe purkaessa salausta (megolm-avaimien hakeminen tietokannasta epäonnistui) --</translation> <translation type="unfinished">-- Virhe purkaessa salausta (megolm-avaimien hakeminen tietokannasta epäonnistui) --</translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation type="unfinished">-- Virhe purkaessa salausta (%1) --</translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation type="unfinished">-- Salattu viesti (tuntematon viestityyppi) --</translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation type="unfinished">Viestin poisto epäonnistui: %1</translation> <translation type="unfinished">Viestin poisto epäonnistui: %1</translation>
</message> </message>
@ -533,53 +515,71 @@
<source>Save file</source> <source>Save file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished">-- Salattu viesti (salauksen purkuavaimia ei löydetty) --</translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished">-- Virhe purkaessa salausta (%1) --</translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished">-- Salattu viesti (tuntematon viestityyppi) --</translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished"> <translation>
<numerusform>%1%2 kirjoittaa</numerusform> <numerusform>%1%2 kirjoittaa</numerusform>
<numerusform>%1 ja %2 kirjoittavat</numerusform> <numerusform>%1 ja %2 kirjoittavat</numerusform>
</translation> </translation>
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -634,11 +634,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -654,12 +659,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -672,7 +672,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -685,7 +685,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation type="unfinished">Lukukuittaukset</translation> <translation type="unfinished">Lukukuittaukset</translation>
</message> </message>
@ -715,7 +720,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished">Sulje</translation> <translation type="unfinished">Sulje</translation>
</message> </message>
@ -777,7 +782,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>Pienennä ilmoitusalueelle</translation> <translation>Pienennä ilmoitusalueelle</translation>
</message> </message>
@ -798,6 +803,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation>Kirjoitusilmoitukset</translation> <translation>Kirjoitusilmoitukset</translation>
</message> </message>
@ -847,7 +857,7 @@
<translation>Laitteen sormenjälki</translation> <translation>Laitteen sormenjälki</translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation>Istunnon avaimet</translation> <translation>Istunnon avaimet</translation>
</message> </message>
@ -867,22 +877,22 @@
<translation>SALAUS</translation> <translation>SALAUS</translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>YLEISET ASETUKSET</translation> <translation>YLEISET ASETUKSET</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation>Avaa Istuntoavaintiedosto</translation> <translation>Avaa Istuntoavaintiedosto</translation>
</message> </message>

112
resources/langs/nheko_fr.ts
View File

@ -4,13 +4,13 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -50,12 +50,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -480,13 +480,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <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> <translation type="unfinished"></translation>
@ -498,19 +492,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -534,9 +516,27 @@
<source>Save file</source> <source>Save file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -545,42 +545,42 @@
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -635,11 +635,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -655,12 +660,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -673,7 +673,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -686,7 +686,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation type="unfinished">Accusés de lecture</translation> <translation type="unfinished">Accusés de lecture</translation>
</message> </message>
@ -716,7 +721,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -778,7 +783,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>Réduire à la barre des tâches</translation> <translation>Réduire à la barre des tâches</translation>
</message> </message>
@ -799,6 +804,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation>Notifications d&apos;écriture</translation> <translation>Notifications d&apos;écriture</translation>
</message> </message>
@ -848,7 +858,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -868,22 +878,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>GÉNÉRAL</translation> <translation>GÉNÉRAL</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

114
resources/langs/nheko_ja.ts
View File

@ -4,13 +4,13 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation>ユーザーを招待できませんでした: %1</translation> <translation>ユーザーを招待できませんでした: %1</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation>招待されたユーザー: %1</translation> <translation>招待されたユーザー: %1</translation>
</message> </message>
@ -50,12 +50,12 @@
<translation>永久追放を解除されたユーザー: %1</translation> <translation>永久追放を解除されたユーザー: %1</translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation>メディアをアップロードできませんでした。やり直して下さい。</translation> <translation>メディアをアップロードできませんでした。やり直して下さい。</translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation>OLMアカウントを復元できませんでした。もう一度ログインして下さい。</translation> <translation>OLMアカウントを復元できませんでした。もう一度ログインして下さい。</translation>
</message> </message>
@ -479,13 +479,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation>-- 暗号化イベント (復号鍵が見つかりません) --</translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- 復号エラー (データベースと通信できませんでした) --</translation> <translation>-- 復号エラー (データベースと通信できませんでした) --</translation>
@ -497,19 +491,7 @@
<translation>-- 復号エラー (データベースからmegolm鍵を取得できませんでした) --</translation> <translation>-- 復号エラー (データベースからmegolm鍵を取得できませんでした) --</translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation>-- 復号エラー (%1) --</translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation>-- 暗号化イベント (不明なイベント型です) --</translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation>メッセージを編集できませんでした: %1</translation> <translation>メッセージを編集できませんでした: %1</translation>
</message> </message>
@ -533,9 +515,27 @@
<source>Save file</source> <source>Save file</source>
<translation>ファイルを保存</translation> <translation>ファイルを保存</translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished">-- 暗号化イベント (復号鍵が見つかりません) --</translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished">-- 復号エラー (%1) --</translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished">-- 暗号化イベント (不明なイベント型です) --</translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation> <translation>
<numerusform>%1%2が入力しています</numerusform> <numerusform>%1%2が入力しています</numerusform>
@ -543,42 +543,42 @@
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -633,11 +633,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation>%1の永久追放を解除しました</translation> <translation type="unfinished">%1 の永久追放を解除しました。</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation>%1がノックを編集しました。</translation> <translation>%1がノックを編集しました。</translation>
</message> </message>
@ -653,12 +658,7 @@
<translation type="unfinished">退出済みの%1が退出しました!</translation> <translation type="unfinished">退出済みの%1が退出しました!</translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -671,7 +671,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation>返信</translation> <translation>返信</translation>
</message> </message>
@ -684,7 +684,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished">返信</translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation>開封確認</translation> <translation>開封確認</translation>
</message> </message>
@ -714,7 +719,7 @@
<translation>部屋が開いていません</translation> <translation>部屋が開いていません</translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation>閉じる</translation> <translation>閉じる</translation>
</message> </message>
@ -776,7 +781,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>トレイへ最小化</translation> <translation>トレイへ最小化</translation>
</message> </message>
@ -797,6 +802,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation>入力状態の通知</translation> <translation>入力状態の通知</translation>
</message> </message>
@ -846,7 +856,7 @@
<translation>デバイスの指紋</translation> <translation>デバイスの指紋</translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation>セッション鍵</translation> <translation>セッション鍵</translation>
</message> </message>
@ -866,22 +876,22 @@
<translation>暗号化</translation> <translation>暗号化</translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>全般</translation> <translation>全般</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation>セッションファイルを開く</translation> <translation>セッションファイルを開く</translation>
</message> </message>

112
resources/langs/nheko_nl.ts
View File

@ -4,13 +4,13 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -50,12 +50,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -479,13 +479,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <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> <translation type="unfinished"></translation>
@ -497,19 +491,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -533,9 +515,27 @@
<source>Save file</source> <source>Save file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -544,42 +544,42 @@
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -634,11 +634,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -654,12 +659,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -672,7 +672,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -685,7 +685,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation type="unfinished">Leesbevestigingen</translation> <translation type="unfinished">Leesbevestigingen</translation>
</message> </message>
@ -715,7 +720,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -777,7 +782,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>Minimaliseren naar systeemvak</translation> <translation>Minimaliseren naar systeemvak</translation>
</message> </message>
@ -798,6 +803,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation>Meldingen bij typen van berichten</translation> <translation>Meldingen bij typen van berichten</translation>
</message> </message>
@ -847,7 +857,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -867,22 +877,22 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>ALGEMEEN</translation> <translation>ALGEMEEN</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

112
resources/langs/nheko_pl.ts
View File

@ -4,13 +4,13 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -50,12 +50,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation>Nie udało się przywrócić konta OLM. Spróbuj zalogować się ponownie.</translation> <translation>Nie udało się przywrócić konta OLM. Spróbuj zalogować się ponownie.</translation>
</message> </message>
@ -479,13 +479,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <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> <translation type="unfinished"></translation>
@ -497,19 +491,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation type="unfinished">Redagowanie wiadomości nie powiodło się: %1</translation> <translation type="unfinished">Redagowanie wiadomości nie powiodło się: %1</translation>
</message> </message>
@ -533,9 +515,27 @@
<source>Save file</source> <source>Save file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -545,42 +545,42 @@
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -635,11 +635,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -655,12 +660,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -673,7 +673,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -686,7 +686,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation type="unfinished">Potwierdzenia przeczytania</translation> <translation type="unfinished">Potwierdzenia przeczytania</translation>
</message> </message>
@ -716,7 +721,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -778,7 +783,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>Zminimalizuj do paska zadań</translation> <translation>Zminimalizuj do paska zadań</translation>
</message> </message>
@ -799,6 +804,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation>Powiadomienia o pisaniu</translation> <translation>Powiadomienia o pisaniu</translation>
</message> </message>
@ -848,7 +858,7 @@
<translation>Odcisk palca urządzenia</translation> <translation>Odcisk palca urządzenia</translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -868,22 +878,22 @@
<translation>SZYFROWANIE</translation> <translation>SZYFROWANIE</translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>OGÓLNE</translation> <translation>OGÓLNE</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

112
resources/langs/nheko_ru.ts
View File

@ -4,13 +4,13 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -50,12 +50,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation>Не удалось восстановить учетную запись OLM. Пожалуйста, войдите снова.</translation> <translation>Не удалось восстановить учетную запись OLM. Пожалуйста, войдите снова.</translation>
</message> </message>
@ -479,13 +479,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <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> <translation type="unfinished"></translation>
@ -497,19 +491,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation type="unfinished">Ошибка редактирования сообщения: %1</translation> <translation type="unfinished">Ошибка редактирования сообщения: %1</translation>
</message> </message>
@ -533,9 +515,27 @@
<source>Save file</source> <source>Save file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -545,42 +545,42 @@
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -635,11 +635,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -655,12 +660,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -673,7 +673,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -686,7 +686,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation type="unfinished">Подтверждать прочтение</translation> <translation type="unfinished">Подтверждать прочтение</translation>
</message> </message>
@ -716,7 +721,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished">Закрыть</translation> <translation type="unfinished">Закрыть</translation>
</message> </message>
@ -778,7 +783,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>Сворачивать в системную панель</translation> <translation>Сворачивать в системную панель</translation>
</message> </message>
@ -799,6 +804,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation>Сообщать о наборе сообщения</translation> <translation>Сообщать о наборе сообщения</translation>
</message> </message>
@ -848,7 +858,7 @@
<translation>Отпечаток устройства</translation> <translation>Отпечаток устройства</translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation>Ключи сеанса</translation> <translation>Ключи сеанса</translation>
</message> </message>
@ -868,22 +878,22 @@
<translation>ШИФРОВАНИЕ</translation> <translation>ШИФРОВАНИЕ</translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>ГЛАВНОЕ</translation> <translation>ГЛАВНОЕ</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation>Открыть файл сеансов</translation> <translation>Открыть файл сеансов</translation>
</message> </message>

112
resources/langs/nheko_zh_CN.ts
View File

@ -4,13 +4,13 @@
<context> <context>
<name>ChatPage</name> <name>ChatPage</name>
<message> <message>
<location filename="../../src/ChatPage.cpp" line="+223"/> <location filename="../../src/ChatPage.cpp" line="+225"/>
<source>Failed to invite user: %1</source> <source>Failed to invite user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+868"/> <location line="+894"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -50,12 +50,12 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-807"/> <location line="-815"/>
<source>Failed to upload media. Please try again.</source> <source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+399"/> <location line="+407"/>
<source>Failed to restore OLM account. Please login again.</source> <source>Failed to restore OLM account. Please login again.</source>
<translation>恢复 OLM 账户失败。请重新登录。</translation> <translation>恢复 OLM 账户失败。请重新登录。</translation>
</message> </message>
@ -479,13 +479,7 @@
<context> <context>
<name>TimelineModel</name> <name>TimelineModel</name>
<message> <message>
<location filename="../../src/timeline/TimelineModel.cpp" line="+714"/> <location filename="../../src/timeline/TimelineModel.cpp" line="+733"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+15"/>
<source>-- Decryption Error (failed to communicate with DB) --</source> <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> <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> <translation type="unfinished"></translation>
@ -497,19 +491,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+12"/> <location line="+88"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed ad %1</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+47"/>
<source>Message redaction failed: %1</source> <source>Message redaction failed: %1</source>
<translation type="unfinished">删除消息失败：%1</translation> <translation type="unfinished">删除消息失败：%1</translation>
</message> </message>
@ -533,9 +515,27 @@
<source>Save file</source> <source>Save file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<location line="-582"/>
<source>-- Encrypted Event (No keys found for decryption) --</source>
<comment>Placeholder, when the message was not decrypted yet or can&apos;t be decrypted.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+46"/>
<source>-- Decryption Error (%1) --</source>
<comment>Placeholder, when the message can&apos;t be decrypted. In this case, the Olm decrytion returned an error, which is passed as %1.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn&apos;t parse it, because Nheko/mtxclient don&apos;t support that event type yet.</comment>
<translation type="unfinished"></translation>
</message>
<message numerus="yes"> <message numerus="yes">
<location line="+129"/> <location line="+636"/>
<source>%1 and %2 are typing</source> <source>%1 and %2 are typing.</source>
<comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment> <comment>Multiple users are typing. First argument is a comma separated list of potentially multiple users. Second argument is the last user of that list. (If only one user is typing, %1 is empty. You should still use it in your string though to silence Qt warnings.)</comment>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -543,42 +543,42 @@
</message> </message>
<message> <message>
<location line="+68"/> <location line="+68"/>
<source>%1 opened the room to the public</source> <source>%1 opened the room to the public.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 made this room require and invitation to join</source> <source>%1 made this room require and invitation to join.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room open to guests</source> <source>%1 made the room open to guests.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>%1 has closed the room to guest access</source> <source>%1 has closed the room to guest access.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+23"/> <location line="+23"/>
<source>%1 made the room history world readable. Events may be now read by non-joined people</source> <source>%1 made the room history world readable. Events may be now read by non-joined people.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<source>%1 set the room history visible to members from this point on</source> <source>%1 set the room history visible to members from this point on.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they were invited</source> <source>%1 set the room history visible to members since they were invited.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+3"/>
<source>%1 set the room history visible to members since they joined the room</source> <source>%1 set the room history visible to members since they joined the room.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
@ -633,11 +633,16 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Unbanned %1</source> <source>Unbanned %1.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+14"/>
<source>%1 was banned.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-11"/>
<source>%1 redacted their knock.</source> <source>%1 redacted their knock.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -653,12 +658,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+7"/> <location line="+15"/>
<source>%1 was banned</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+8"/>
<source> Reason: %1</source> <source> Reason: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -671,7 +671,7 @@
<context> <context>
<name>TimelineRow</name> <name>TimelineRow</name>
<message> <message>
<location filename="../qml/TimelineRow.qml" line="+84"/> <location filename="../qml/TimelineRow.qml" line="+69"/>
<source>Reply</source> <source>Reply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -684,7 +684,12 @@
<context> <context>
<name>TimelineView</name> <name>TimelineView</name>
<message> <message>
<location filename="../qml/TimelineView.qml" line="+32"/> <location filename="../qml/TimelineView.qml" line="+45"/>
<source>Reply</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+4"/>
<source>Read receipts</source> <source>Read receipts</source>
<translation type="unfinished">阅读回执</translation> <translation type="unfinished">阅读回执</translation>
</message> </message>
@ -714,7 +719,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+239"/> <location line="+241"/>
<source>Close</source> <source>Close</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -776,7 +781,7 @@
<context> <context>
<name>UserSettingsPage</name> <name>UserSettingsPage</name>
<message> <message>
<location filename="../../src/UserSettingsPage.cpp" line="+290"/> <location filename="../../src/UserSettingsPage.cpp" line="+296"/>
<source>Minimize to tray</source> <source>Minimize to tray</source>
<translation>最小化至托盘</translation> <translation>最小化至托盘</translation>
</message> </message>
@ -797,6 +802,11 @@
</message> </message>
<message> <message>
<location line="+2"/> <location line="+2"/>
<source>Show buttons in timeline</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+1"/>
<source>Typing notifications</source> <source>Typing notifications</source>
<translation>打字通知</translation> <translation>打字通知</translation>
</message> </message>
@ -846,7 +856,7 @@
<translation>设备指纹</translation> <translation>设备指纹</translation>
</message> </message>
<message> <message>
<location line="-56"/> <location line="-57"/>
<source>Session Keys</source> <source>Session Keys</source>
<translation>会话密钥</translation> <translation>会话密钥</translation>
</message> </message>
@ -866,22 +876,22 @@
<translation>加密</translation> <translation>加密</translation>
</message> </message>
<message> <message>
<location line="-60"/> <location line="-61"/>
<source>GENERAL</source> <source>GENERAL</source>
<translation>通用</translation> <translation>通用</translation>
</message> </message>
<message> <message>
<location line="+22"/> <location line="+23"/>
<source>INTERFACE</source> <source>INTERFACE</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+105"/> <location line="+106"/>
<source>Emoji Font Family</source> <source>Emoji Font Family</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+142"/> <location line="+147"/>
<source>Open Sessions File</source> <source>Open Sessions File</source>
<translation>打开会话文件</translation> <translation>打开会话文件</translation>
</message> </message>

7
resources/qml/Avatar.qml
View File

@ -1,6 +1,5 @@
import QtQuick 2.6 import QtQuick 2.6
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import Qt.labs.settings 1.0
Rectangle { Rectangle {
id: avatar id: avatar
@ -8,12 +7,6 @@ Rectangle {
height: 48 height: 48
radius: settings.avatar_circles ? height/2 : 3 radius: settings.avatar_circles ? height/2 : 3
Settings {
id: settings
category: "user"
property bool avatar_circles: true
}
property alias url: img.source property alias url: img.source
property string displayName property string displayName

36
resources/qml/TimelineRow.qml
View File

@ -8,36 +8,21 @@ import im.nheko 1.0
import "./delegates" import "./delegates"
MouseArea { MouseArea {
id: rowArea
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: row.height height: row.height
hoverEnabled: true
preventStealing: true
propagateComposedEvents: true propagateComposedEvents: true
acceptedButtons: Qt.NoButton preventStealing: true
property bool showButtons: false acceptedButtons: Qt.LeftButton | Qt.RightButton
onClicked: {
Timer { if (mouse.button === Qt.RightButton)
running: rowArea.containsMouse messageContextMenu.show(model.id, model.type, row)
interval: 150
onTriggered: rowArea.state = "showButtons"
} }
onPressAndHold: {
states: [ if (mouse.source === Qt.MouseEventNotSynthesized)
State { messageContextMenu.show(model.id, model.type, row)
name: "hideButtons"
when: !rowArea.containsMouse
PropertyChanges { target: rowArea; showButtons: false; }
},
State {
name: "showButtons"
PropertyChanges { target: rowArea; showButtons: true; }
} }
]
RowLayout { RowLayout {
id: row id: row
@ -70,7 +55,7 @@ MouseArea {
} }
ImageButton { ImageButton {
visible: rowArea.showButtons visible: timelineSettings.buttons
Layout.alignment: Qt.AlignRight | Qt.AlignTop Layout.alignment: Qt.AlignRight | Qt.AlignTop
Layout.preferredHeight: 16 Layout.preferredHeight: 16
width: 16 width: 16
@ -86,7 +71,7 @@ MouseArea {
onClicked: chat.model.replyAction(model.id) onClicked: chat.model.replyAction(model.id)
} }
ImageButton { ImageButton {
visible: rowArea.showButtons visible: timelineSettings.buttons
Layout.alignment: Qt.AlignRight | Qt.AlignTop Layout.alignment: Qt.AlignRight | Qt.AlignTop
Layout.preferredHeight: 16 Layout.preferredHeight: 16
width: 16 width: 16
@ -125,6 +110,7 @@ MouseArea {
id: ma id: ma
anchors.fill: parent anchors.fill: parent
hoverEnabled: true hoverEnabled: true
propagateComposedEvents: true
} }
ToolTip.visible: ma.containsMouse ToolTip.visible: ma.containsMouse

19
resources/qml/TimelineView.qml
View File

@ -3,6 +3,7 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.2 import QtQuick.Layouts 1.2
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
import QtQuick.Window 2.2 import QtQuick.Window 2.2
import Qt.labs.settings 1.0
import im.nheko 1.0 import im.nheko 1.0
@ -14,6 +15,18 @@ Item {
property var inactiveColors: currentInactivePalette ? currentInactivePalette : systemInactive property var inactiveColors: currentInactivePalette ? currentInactivePalette : systemInactive
property int avatarSize: 40 property int avatarSize: 40
Settings {
id: settings
category: "user"
property bool avatar_circles: true
}
Settings {
id: timelineSettings
category: "user/timeline"
property bool buttons: true
}
Menu { Menu {
id: messageContextMenu id: messageContextMenu
palette: colors palette: colors
@ -28,6 +41,10 @@ Item {
property string eventId property string eventId
property int eventType property int eventType
MenuItem {
text: qsTr("Reply")
onClicked: chat.model.replyAction(messageContextMenu.eventId)
}
MenuItem { MenuItem {
text: qsTr("Read receipts") text: qsTr("Read receipts")
onTriggered: chat.model.readReceiptsAction(messageContextMenu.eventId) onTriggered: chat.model.readReceiptsAction(messageContextMenu.eventId)
@ -212,6 +229,7 @@ Item {
anchors.fill: parent anchors.fill: parent
onClicked: chat.model.openUserProfile(modelData.userId) onClicked: chat.model.openUserProfile(modelData.userId)
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
propagateComposedEvents: true
} }
} }
@ -225,6 +243,7 @@ Item {
anchors.fill: parent anchors.fill: parent
onClicked: chat.model.openUserProfile(section.split(" ")[0]) onClicked: chat.model.openUserProfile(section.split(" ")[0])
cursorShape: Qt.PointingHandCursor cursorShape: Qt.PointingHandCursor
propagateComposedEvents: true
} }
} }
} }

2
resources/qml/delegates/ImageMessage.qml
View File

@ -3,7 +3,7 @@ import QtQuick 2.6
import im.nheko 1.0 import im.nheko 1.0
Item { Item {
property double tempWidth: Math.min(parent ? parent.width : undefined, model.data.width) property double tempWidth: Math.min(parent ? parent.width : undefined, model.data.width < 1 ? parent.width : model.data.width)
property double tempHeight: tempWidth * model.data.proportionalHeight property double tempHeight: tempWidth * model.data.proportionalHeight
property bool tooHigh: tempHeight > timelineRoot.height / 2 property bool tooHigh: tempHeight > timelineRoot.height / 2

11
src/ChatPage.cpp
View File

@ -307,16 +307,16 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
QString mimeClass, QString mimeClass,
const QString &fn, const QString &fn,
const std::optional<RelatedInfo> &related) { const std::optional<RelatedInfo> &related) {
QMimeDatabase db;
QMimeType mime = db.mimeTypeForData(dev.data());
if (!dev->open(QIODevice::ReadOnly)) { if (!dev->open(QIODevice::ReadOnly)) {
emit uploadFailed( emit uploadFailed(
QString("Error while reading media: %1").arg(dev->errorString())); QString("Error while reading media: %1").arg(dev->errorString()));
return; return;
} }
auto bin = dev->peek(dev->size()); auto bin = dev->readAll();
QMimeDatabase db;
QMimeType mime = db.mimeTypeForData(bin);
auto payload = std::string(bin.data(), bin.size()); auto payload = std::string(bin.data(), bin.size());
std::optional<mtx::crypto::EncryptedFile> encryptedFile; std::optional<mtx::crypto::EncryptedFile> encryptedFile;
if (cache::isRoomEncrypted(current_room_.toStdString())) { if (cache::isRoomEncrypted(current_room_.toStdString())) {
@ -328,10 +328,9 @@ ChatPage::ChatPage(QSharedPointer<UserSettings> userSettings, QWidget *parent)
QSize dimensions; QSize dimensions;
QString blurhash; QString blurhash;
if (mimeClass == "image") { if (mimeClass == "image") {
dimensions = QImageReader(dev.data()).size();
QImage img; QImage img;
img.loadFromData(bin); img.loadFromData(bin);
dimensions = img.size();
if (img.height() > 200 && img.width() > 360) if (img.height() > 200 && img.width() > 360)
img = img.scaled(360, 200, Qt::KeepAspectRatioByExpanding); img = img.scaled(360, 200, Qt::KeepAspectRatioByExpanding);
std::vector<unsigned char> data; std::vector<unsigned char> data;

12
src/UserSettingsPage.cpp
View File

@ -55,6 +55,7 @@ UserSettings::load()
hasDesktopNotifications_ = settings.value("user/desktop_notifications", true).toBool(); hasDesktopNotifications_ = settings.value("user/desktop_notifications", true).toBool();
isStartInTrayEnabled_ = settings.value("user/window/start_in_tray", false).toBool(); isStartInTrayEnabled_ = settings.value("user/window/start_in_tray", false).toBool();
isGroupViewEnabled_ = settings.value("user/group_view", true).toBool(); isGroupViewEnabled_ = settings.value("user/group_view", true).toBool();
isButtonsInTimelineEnabled_ = settings.value("user/timeline/buttons", true).toBool();
isMarkdownEnabled_ = settings.value("user/markdown_enabled", true).toBool(); isMarkdownEnabled_ = settings.value("user/markdown_enabled", true).toBool();
isTypingNotificationsEnabled_ = settings.value("user/typing_notifications", true).toBool(); isTypingNotificationsEnabled_ = settings.value("user/typing_notifications", true).toBool();
ignoreMinorEvents_ = settings.value("user/minor_events", false).toBool(); ignoreMinorEvents_ = settings.value("user/minor_events", false).toBool();
@ -127,6 +128,10 @@ UserSettings::save()
settings.setValue("start_in_tray", isStartInTrayEnabled_); settings.setValue("start_in_tray", isStartInTrayEnabled_);
settings.endGroup(); settings.endGroup();
settings.beginGroup("timeline");
settings.setValue("buttons", isButtonsInTimelineEnabled_);
settings.endGroup();
settings.setValue("avatar_circles", avatarCircles_); settings.setValue("avatar_circles", avatarCircles_);
settings.setValue("font_size", baseFontSize_); settings.setValue("font_size", baseFontSize_);
@ -192,6 +197,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
startInTrayToggle_ = new Toggle{this}; startInTrayToggle_ = new Toggle{this};
avatarCircles_ = new Toggle{this}; avatarCircles_ = new Toggle{this};
groupViewToggle_ = new Toggle{this}; groupViewToggle_ = new Toggle{this};
timelineButtonsToggle_ = new Toggle{this};
typingNotifications_ = new Toggle{this}; typingNotifications_ = new Toggle{this};
ignoreMinorEvents_ = new Toggle{this}; ignoreMinorEvents_ = new Toggle{this};
readReceipts_ = new Toggle{this}; readReceipts_ = new Toggle{this};
@ -295,6 +301,7 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
formLayout_->addRow(new HorizontalLine{this}); formLayout_->addRow(new HorizontalLine{this});
boxWrap(tr("Circular Avatars"), avatarCircles_); boxWrap(tr("Circular Avatars"), avatarCircles_);
boxWrap(tr("Group's sidebar"), groupViewToggle_); boxWrap(tr("Group's sidebar"), groupViewToggle_);
boxWrap(tr("Show buttons in timeline"), timelineButtonsToggle_);
boxWrap(tr("Typing notifications"), typingNotifications_); boxWrap(tr("Typing notifications"), typingNotifications_);
boxWrap(tr("Ignore minor events in room list"), ignoreMinorEvents_); boxWrap(tr("Ignore minor events in room list"), ignoreMinorEvents_);
formLayout_->addRow(new HorizontalLine{this}); formLayout_->addRow(new HorizontalLine{this});
@ -402,6 +409,10 @@ UserSettingsPage::UserSettingsPage(QSharedPointer<UserSettings> settings, QWidge
settings_->setIgnoreMinorEvents(!isDisabled); settings_->setIgnoreMinorEvents(!isDisabled);
}); });
connect(timelineButtonsToggle_, &Toggle::toggled, this, [this](bool isDisabled) {
settings_->setButtonsInTimeline(!isDisabled);
});
connect(readReceipts_, &Toggle::toggled, this, [this](bool isDisabled) { connect(readReceipts_, &Toggle::toggled, this, [this](bool isDisabled) {
settings_->setReadReceipts(!isDisabled); settings_->setReadReceipts(!isDisabled);
}); });
@ -437,6 +448,7 @@ UserSettingsPage::showEvent(QShowEvent *)
avatarCircles_->setState(!settings_->isAvatarCirclesEnabled()); avatarCircles_->setState(!settings_->isAvatarCirclesEnabled());
typingNotifications_->setState(!settings_->isTypingNotificationsEnabled()); typingNotifications_->setState(!settings_->isTypingNotificationsEnabled());
ignoreMinorEvents_->setState(!settings_->isIgnoreMinorEventsEnabled()); ignoreMinorEvents_->setState(!settings_->isIgnoreMinorEventsEnabled());
timelineButtonsToggle_->setState(!settings_->isButtonsInTimelineEnabled());
readReceipts_->setState(!settings_->isReadReceiptsEnabled()); readReceipts_->setState(!settings_->isReadReceiptsEnabled());
markdownEnabled_->setState(!settings_->isMarkdownEnabled()); markdownEnabled_->setState(!settings_->isMarkdownEnabled());
desktopNotifications_->setState(!settings_->hasDesktopNotifications()); desktopNotifications_->setState(!settings_->hasDesktopNotifications());

8
src/UserSettingsPage.h
View File

@ -90,6 +90,11 @@ public:
void setIgnoreMinorEvents(bool state) void setIgnoreMinorEvents(bool state)
{ {
ignoreMinorEvents_ = state; ignoreMinorEvents_ = state;
}
void setButtonsInTimeline(bool state)
{
isButtonsInTimelineEnabled_ = state;
save(); save();
} }
@ -113,6 +118,7 @@ public:
bool isMarkdownEnabled() const { return isMarkdownEnabled_; } bool isMarkdownEnabled() const { return isMarkdownEnabled_; }
bool isTypingNotificationsEnabled() const { return isTypingNotificationsEnabled_; } bool isTypingNotificationsEnabled() const { return isTypingNotificationsEnabled_; }
bool isIgnoreMinorEventsEnabled() const { return ignoreMinorEvents_; } bool isIgnoreMinorEventsEnabled() const { return ignoreMinorEvents_; }
bool isButtonsInTimelineEnabled() const { return isButtonsInTimelineEnabled_; }
bool isReadReceiptsEnabled() const { return isReadReceiptsEnabled_; } bool isReadReceiptsEnabled() const { return isReadReceiptsEnabled_; }
bool hasDesktopNotifications() const { return hasDesktopNotifications_; } bool hasDesktopNotifications() const { return hasDesktopNotifications_; }
double fontSize() const { return baseFontSize_; } double fontSize() const { return baseFontSize_; }
@ -135,6 +141,7 @@ private:
bool isMarkdownEnabled_; bool isMarkdownEnabled_;
bool isTypingNotificationsEnabled_; bool isTypingNotificationsEnabled_;
bool ignoreMinorEvents_; bool ignoreMinorEvents_;
bool isButtonsInTimelineEnabled_;
bool isReadReceiptsEnabled_; bool isReadReceiptsEnabled_;
bool hasDesktopNotifications_; bool hasDesktopNotifications_;
bool avatarCircles_; bool avatarCircles_;
@ -183,6 +190,7 @@ private:
Toggle *trayToggle_; Toggle *trayToggle_;
Toggle *startInTrayToggle_; Toggle *startInTrayToggle_;
Toggle *groupViewToggle_; Toggle *groupViewToggle_;
Toggle *timelineButtonsToggle_;
Toggle *typingNotifications_; Toggle *typingNotifications_;
Toggle *ignoreMinorEvents_; Toggle *ignoreMinorEvents_;
Toggle *readReceipts_; Toggle *readReceipts_;

28
src/timeline/TimelineModel.cpp
View File

@ -716,7 +716,7 @@ TimelineModel::decryptEvent(const mtx::events::EncryptedEvent<mtx::events::msg::
dummy.sender = e.sender; dummy.sender = e.sender;
dummy.content.body = dummy.content.body =
tr("-- Encrypted Event (No keys found for decryption) --", tr("-- Encrypted Event (No keys found for decryption) --",
"Placeholder, when the message was not decrypted yet or can't be decrypted") "Placeholder, when the message was not decrypted yet or can't be decrypted.")
.toStdString(); .toStdString();
try { try {
@ -763,7 +763,7 @@ TimelineModel::decryptEvent(const mtx::events::EncryptedEvent<mtx::events::msg::
dummy.content.body = dummy.content.body =
tr("-- Decryption Error (%1) --", tr("-- Decryption Error (%1) --",
"Placeholder, when the message can't be decrypted. In this case, the Olm " "Placeholder, when the message can't be decrypted. In this case, the Olm "
"decrytion returned an error, which is passed ad %1") "decrytion returned an error, which is passed ad %1.")
.arg(e.what()) .arg(e.what())
.toStdString(); .toStdString();
return {dummy, false}; return {dummy, false};
@ -792,7 +792,7 @@ TimelineModel::decryptEvent(const mtx::events::EncryptedEvent<mtx::events::msg::
dummy.content.body = dummy.content.body =
tr("-- Encrypted Event (Unknown event type) --", tr("-- Encrypted Event (Unknown event type) --",
"Placeholder, when the message was decrypted, but we couldn't parse it, because " "Placeholder, when the message was decrypted, but we couldn't parse it, because "
"Nheko/mtxclient don't support that event type yet") "Nheko/mtxclient don't support that event type yet.")
.toStdString(); .toStdString();
return {dummy, false}; return {dummy, false};
} }
@ -1426,7 +1426,7 @@ QString
TimelineModel::formatTypingUsers(const std::vector<QString> &users, QColor bg) TimelineModel::formatTypingUsers(const std::vector<QString> &users, QColor bg)
{ {
QString temp = QString temp =
tr("%1 and %2 are typing", tr("%1 and %2 are typing.",
"Multiple users are typing. First argument is a comma separated list of potentially " "Multiple users are typing. First argument is a comma separated list of potentially "
"multiple users. Second argument is the last user of that list. (If only one user is " "multiple users. Second argument is the last user of that list. (If only one user is "
"typing, %1 is empty. You should still use it in your string though to silence Qt " "typing, %1 is empty. You should still use it in your string though to silence Qt "
@ -1494,9 +1494,9 @@ TimelineModel::formatJoinRuleEvent(QString id)
switch (event->content.join_rule) { switch (event->content.join_rule) {
case mtx::events::state::JoinRule::Public: case mtx::events::state::JoinRule::Public:
return tr("%1 opened the room to the public").arg(name); return tr("%1 opened the room to the public.").arg(name);
case mtx::events::state::JoinRule::Invite: case mtx::events::state::JoinRule::Invite:
return tr("%1 made this room require and invitation to join").arg(name); return tr("%1 made this room require and invitation to join.").arg(name);
default: default:
// Currently, knock and private are reserved keywords and not implemented in Matrix. // Currently, knock and private are reserved keywords and not implemented in Matrix.
return ""; return "";
@ -1519,9 +1519,9 @@ TimelineModel::formatGuestAccessEvent(QString id)
switch (event->content.guest_access) { switch (event->content.guest_access) {
case mtx::events::state::AccessState::CanJoin: case mtx::events::state::AccessState::CanJoin:
return tr("%1 made the room open to guests").arg(name); return tr("%1 made the room open to guests.").arg(name);
case mtx::events::state::AccessState::Forbidden: case mtx::events::state::AccessState::Forbidden:
return tr("%1 has closed the room to guest access").arg(name); return tr("%1 has closed the room to guest access.").arg(name);
default: default:
return ""; return "";
} }
@ -1545,16 +1545,16 @@ TimelineModel::formatHistoryVisibilityEvent(QString id)
switch (event->content.history_visibility) { switch (event->content.history_visibility) {
case mtx::events::state::Visibility::WorldReadable: case mtx::events::state::Visibility::WorldReadable:
return tr("%1 made the room history world readable. Events may be now read by " return tr("%1 made the room history world readable. Events may be now read by "
"non-joined people") "non-joined people.")
.arg(name); .arg(name);
case mtx::events::state::Visibility::Shared: case mtx::events::state::Visibility::Shared:
return tr("%1 set the room history visible to members from this point on") return tr("%1 set the room history visible to members from this point on.")
.arg(name); .arg(name);
case mtx::events::state::Visibility::Invited: case mtx::events::state::Visibility::Invited:
return tr("%1 set the room history visible to members since they were invited") return tr("%1 set the room history visible to members since they were invited.")
.arg(name); .arg(name);
case mtx::events::state::Visibility::Joined: case mtx::events::state::Visibility::Joined:
return tr("%1 set the room history visible to members since they joined the room") return tr("%1 set the room history visible to members since they joined the room.")
.arg(name); .arg(name);
default: default:
return ""; return "";
@ -1661,7 +1661,7 @@ TimelineModel::formatMemberEvent(QString id)
else else
rendered = tr("Kicked %1.").arg(name); rendered = tr("Kicked %1.").arg(name);
} else if (prevEvent->content.membership == Membership::Ban) { } else if (prevEvent->content.membership == Membership::Ban) {
rendered = tr("Unbanned %1").arg(name); rendered = tr("Unbanned %1.").arg(name);
} else if (prevEvent->content.membership == Membership::Knock) { } else if (prevEvent->content.membership == Membership::Knock) {
if (event->state_key == event->sender) if (event->state_key == event->sender)
rendered = tr("%1 redacted their knock.").arg(name); rendered = tr("%1 redacted their knock.").arg(name);
@ -1675,7 +1675,7 @@ TimelineModel::formatMemberEvent(QString id)
break; break;
case Membership::Ban: case Membership::Ban:
rendered = tr("%1 was banned").arg(name); rendered = tr("%1 was banned.").arg(name);
break; break;
case Membership::Knock: case Membership::Knock:
rendered = tr("%1 knocked.").arg(name); rendered = tr("%1 knocked.").arg(name);