Merge branch '0.7.0-dev' of ssh://github.com/Nheko-Reborn/nheko into 0.7.0-dev

3 files changed, 65 insertions, 61 deletions

diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index 2099d059..35240772 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -14,7 +14,7 @@
     <message>
         <location filename="../../src/ChatPage.cpp" line="+331"/>
         <source>Failed to upload image. Please try again.</source>
-        <translation>Hochladen der Bilddatei fehlgeschlagen. Bitte versuche es erneut.</translation>
+        <translation>Hochladen des Bildes fehlgeschlagen. Bitte versuche es erneut.</translation>
     </message>
     <message>
         <location line="+45"/>
@@ -39,12 +39,12 @@
     <message>
         <location line="+5"/>
         <source>Failed to restore save data. Please login again.</source>
-        <translation>Nachrichten konnten nicht aus dem Cache geladen werden. Bitte melde dich erneut an.</translation>
+        <translation>Gespeicherte Nachrichten konnten nicht wiederhergestellt werden. Bitte melde Dich erneut an.</translation>
     </message>
     <message>
         <location line="+198"/>
         <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
-        <translation>Erstellung des Schlüsselmaterials fehlgeschlagen. Antwort des Servers: %1 %2. Bitte versuche es später erneut.</translation>
+        <translation>Fehler beim Setup der Verschlüsselungsschlüssel. Servermeldung: %1 %2. Bitte versuche es später erneut.</translation>
     </message>
     <message>
         <location line="+51"/>
@@ -84,12 +84,12 @@
         <location line="+2"/>
         <location line="+2"/>
         <source> (tag)</source>
-        <translation type="unfinished"> (tag)</translation>
+        <translation> (tag)</translation>
     </message>
     <message>
         <location line="+3"/>
         <source> (community)</source>
-        <translation type="unfinished"></translation>
+        <translation> (community)</translation>
     </message>
 </context>
 <context>
@@ -207,7 +207,7 @@
     <message>
         <location line="+4"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -419,31 +419,31 @@
         <location line="+65"/>
         <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>
+        <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>
         <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>-- Entschlüsselungsfehler (Fehler bei Kommunikation mit Datenbank) --</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
         <comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed.</comment>
-        <translation type="unfinished"></translation>
+        <translation>-- Entschlüsselungsfehler (Fehler bei Suche nach megolm Schlüsseln in Datenbank) --</translation>
     </message>
     <message>
         <location line="+12"/>
         <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>
+        <translation>-- Entschlüsselungsfehler (%1) --</translation>
     </message>
     <message>
         <location line="+27"/>
         <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>
+        <translation>-- verschlüsselter Event (Unbekannter Eventtyp) --</translation>
     </message>
 </context>
 <context>
@@ -456,7 +456,7 @@
     <message>
         <location line="+5"/>
         <source>Mentions</source>
-        <translation type="unfinished"></translation>
+        <translation>Erwähnungen</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -542,7 +542,7 @@
     <message>
         <location line="+9"/>
         <source>Desktop notifications</source>
-        <translation type="unfinished"></translation>
+        <translation>Desktopbenachrichtigungen</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -562,7 +562,7 @@
     <message>
         <location line="+1"/>
         <source>Emoji Font Famly</source>
-        <translation type="unfinished"></translation>
+        <translation>Emoji Schriftart</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -577,7 +577,7 @@
     <message>
         <location line="+12"/>
         <source>Device Fingerprint</source>
-        <translation type="unfinished"></translation>
+        <translation>Gerätefingerabdruck</translation>
     </message>
     <message>
         <location line="+11"/>
@@ -607,7 +607,7 @@
     <message>
         <location line="+156"/>
         <source>Open Sessions File</source>
-        <translation type="unfinished"></translation>
+        <translation>Öffne Sessions Datei</translation>
     </message>
     <message>
         <location line="+4"/>
@@ -661,7 +661,7 @@
     <message>
         <location line="+1"/>
         <source>Enjoy your stay!</source>
-        <translation>Genieße deinen Aufenthalt!</translation>
+        <translation>Viel Vergnügen!</translation>
     </message>
     <message>
         <location line="+23"/>
@@ -679,7 +679,7 @@
     <message>
         <location filename="../../src/Utils.cpp" line="+104"/>
         <source>Yesterday</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestern</translation>
     </message>
 </context>
 <context>
@@ -840,12 +840,12 @@ Medien-Größe: %2
     <message>
         <location line="-44"/>
         <source>Today %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Heute %1</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Yesterday %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Gestern %1</translation>
     </message>
 </context>
 <context>
@@ -923,7 +923,7 @@ Medien-Größe: %2
     <message>
         <location line="+1"/>
         <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
+        <translation>Verschlüsselung befindet sich momentan in einem experimentellen Stadium, unerwartete Fehler können auftreten. &lt;br&gt;Sie kann anschließend nicht wieder deaktiviert werden.</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -935,7 +935,7 @@ Medien-Größe: %2
         <source>Whether or not the client should respond automatically with the session keys
  upon request. Use with caution, this is a temporary measure to test the
  E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Ob nheko automatisch auf Anfragen mit Sessionschlüsseln antworten soll, oder nicht. Bitte mit Vorsicht nutzen, da dies eine temporäre Massnahme ist. Sie dient dem Test von E2E Verschlüsselung, bis die Geräteverifikation fertig gestellt ist.</translation>
     </message>
     <message numerus="yes">
         <location line="+53"/>
@@ -1054,7 +1054,7 @@ Medien-Größe: %2
         <location filename="../../src/Utils.cpp" line="+46"/>
         <location filename="../../src/Utils.h" line="+141"/>
         <source>You</source>
-        <translation type="unfinished"></translation>
+        <translation>Du</translation>
     </message>
     <message>
         <location line="+219"/>
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index 5dcb4f61..2f4739ad 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -207,7 +207,7 @@
     <message>
         <location line="+4"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -419,31 +419,31 @@
         <location line="+65"/>
         <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>
+        <translation>-- Encrypted Event (No keys found for decryption) --</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>-- Decryption Error (failed to communicate with DB) --</source>
         <comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
-        <translation type="unfinished"></translation>
+        <translation>-- Decryption Error (failed to communicate with DB) --</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
         <comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed.</comment>
-        <translation type="unfinished"></translation>
+        <translation>-- Decryption Error (failed to retrieve megolm keys from db) --</translation>
     </message>
     <message>
         <location line="+12"/>
         <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>
+        <translation>-- Decryption Error (%1) --</translation>
     </message>
     <message>
         <location line="+27"/>
         <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>
+        <translation>-- Encrypted Event (Unknown event type) --</translation>
     </message>
 </context>
 <context>
@@ -456,7 +456,7 @@
     <message>
         <location line="+5"/>
         <source>Mentions</source>
-        <translation type="unfinished"></translation>
+        <translation>Mentions</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -562,7 +562,7 @@
     <message>
         <location line="+1"/>
         <source>Emoji Font Famly</source>
-        <translation type="unfinished"></translation>
+        <translation>Emoji Font Family</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -679,7 +679,7 @@
     <message>
         <location filename="../../src/Utils.cpp" line="+104"/>
         <source>Yesterday</source>
-        <translation type="unfinished"></translation>
+        <translation>Yesterday</translation>
     </message>
 </context>
 <context>
@@ -840,12 +840,12 @@ Media size: %2
     <message>
         <location line="-44"/>
         <source>Today %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Today %1</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Yesterday %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Yesterday %1</translation>
     </message>
 </context>
 <context>
@@ -923,7 +923,7 @@ Media size: %2
     <message>
         <location line="+1"/>
         <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
+        <translation>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -935,7 +935,9 @@ Media size: %2
         <source>Whether or not the client should respond automatically with the session keys
  upon request. Use with caution, this is a temporary measure to test the
  E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Whether or not the client should respond automatically with the session keys
+ upon request. Use with caution, this is a temporary measure to test the
+ E2E implementation until device verification is completed.</translation>
     </message>
     <message numerus="yes">
         <location line="+53"/>
@@ -1054,27 +1056,27 @@ Media size: %2
         <location filename="../../src/Utils.cpp" line="+46"/>
         <location filename="../../src/Utils.h" line="+141"/>
         <source>You</source>
-        <translation type="unfinished"></translation>
+        <translation>You</translation>
     </message>
     <message>
         <location line="+219"/>
         <source>sent a file.</source>
-        <translation type="unfinished"></translation>
+        <translation>sent a file.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>sent an image.</source>
-        <translation type="unfinished"></translation>
+        <translation>sent an image.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>sent an audio file.</source>
-        <translation type="unfinished"></translation>
+        <translation>sent an audio file.</translation>
     </message>
     <message>
         <location line="+3"/>
         <source>sent a video</source>
-        <translation type="unfinished"></translation>
+        <translation>sent a video.</translation>
     </message>
     <message>
         <location filename="../../src/Utils.h" line="-45"/>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 86374eb4..e3116dfe 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -207,7 +207,7 @@
     <message>
         <location line="+4"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>OK</translation>
     </message>
 </context>
 <context>
@@ -419,31 +419,31 @@
         <location line="+65"/>
         <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>
+        <translation>-- Salattu viesti (salauksen purkuavaimia ei löydetty) --</translation>
     </message>
     <message>
         <location line="+15"/>
         <source>-- Decryption Error (failed to communicate with DB) --</source>
         <comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed when trying to lookup the session.</comment>
-        <translation type="unfinished"></translation>
+        <translation>-- Virhe purkaessa salausta (tietokannan kanssa kommunikointi epäonnistui) --</translation>
     </message>
     <message>
         <location line="+19"/>
         <source>-- Decryption Error (failed to retrieve megolm keys from db) --</source>
         <comment>Placeholder, when the message can&apos;t be decrypted, because the DB access failed.</comment>
-        <translation type="unfinished"></translation>
+        <translation>-- Virhe purkaessa salausta (megolm-avaimien hakeminen tietokannasta epäonnistui) --</translation>
     </message>
     <message>
         <location line="+12"/>
         <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>
+        <translation>-- Virhe purkaessa salausta (%1) --</translation>
     </message>
     <message>
         <location line="+27"/>
         <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>
+        <translation>-- Salattu viesti (tuntematon viestityyppi) --</translation>
     </message>
 </context>
 <context>
@@ -456,7 +456,7 @@
     <message>
         <location line="+5"/>
         <source>Mentions</source>
-        <translation type="unfinished"></translation>
+        <translation>Maininnat</translation>
     </message>
     <message>
         <location line="+34"/>
@@ -489,7 +489,7 @@
     <message>
         <location line="+1"/>
         <source>Quit</source>
-        <translation type="unfinished">Lopeta</translation>
+        <translation>Lopeta</translation>
     </message>
 </context>
 <context>
@@ -498,9 +498,9 @@
         <location filename="../../src/TypingDisplay.cpp" line="+37"/>
         <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>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
+        <translation>
+            <numerusform>%1%2 kirjoittaa</numerusform>
+            <numerusform>%1 ja %2 kirjoittavat</numerusform>
         </translation>
     </message>
 </context>
@@ -557,12 +557,12 @@
     <message>
         <location line="+13"/>
         <source>Font Family</source>
-        <translation>Fontti</translation>
+        <translation>Fonttiperhe</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Emoji Font Famly</source>
-        <translation type="unfinished"></translation>
+        <translation>Emoji-fonttiperhe</translation>
     </message>
     <message>
         <location line="+33"/>
@@ -679,7 +679,7 @@
     <message>
         <location filename="../../src/Utils.cpp" line="+104"/>
         <source>Yesterday</source>
-        <translation type="unfinished"></translation>
+        <translation>Eilen</translation>
     </message>
 </context>
 <context>
@@ -840,12 +840,12 @@ Median koko: %2
     <message>
         <location line="-44"/>
         <source>Today %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Tänään %1</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Yesterday %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Eilen %1</translation>
     </message>
 </context>
 <context>
@@ -923,7 +923,7 @@ Median koko: %2
     <message>
         <location line="+1"/>
         <source>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</source>
-        <translation type="unfinished"></translation>
+        <translation>Salaus on tällä hetkellä kokeellinen ja asiat saattavat mennä rikki odottamattomasti.&lt;br&gt;Huomaa, ettei sitä voi poistaa käytöstä jälkikäteen.</translation>
     </message>
     <message>
         <location line="+27"/>
@@ -935,7 +935,9 @@ Median koko: %2
         <source>Whether or not the client should respond automatically with the session keys
  upon request. Use with caution, this is a temporary measure to test the
  E2E implementation until device verification is completed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Pitäisikö asiakasohjelman palauttaa salausavaimet automaattisesti pyydettäessä.
+ Käytä varoen, tämä on väliaikainen vaihtoehto salausjärjestelmän testausta varten,
+ kunnes laitteiden vahvistus on valmis.</translation>
     </message>
     <message numerus="yes">
         <location line="+53"/>
@@ -987,7 +989,7 @@ Median koko: %2
     <message>
         <location line="+9"/>
         <source>Ignore messages from this user</source>
-        <translation type="unfinished">Piilota tämän käyttäjän viestit</translation>
+        <translation>Jätä tämän käyttäjän viestit huomiotta</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -1054,7 +1056,7 @@ Median koko: %2
         <location filename="../../src/Utils.cpp" line="+46"/>
         <location filename="../../src/Utils.h" line="+141"/>
         <source>You</source>
-        <translation type="unfinished"></translation>
+        <translation>Sinä</translation>
     </message>
     <message>
         <location line="+219"/>