From 000ab4853a4b83408af42d59ed753ae76aa26e80 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sun, 10 May 2020 01:38:40 +0200 Subject: Translation updates --- resources/langs/nheko_de.ts | 136 ++++++++++++++++++++++++++++----------- resources/langs/nheko_el.ts | 122 +++++++++++++++++++++++++---------- resources/langs/nheko_en.qm | Bin 0 -> 32178 bytes resources/langs/nheko_en.ts | 140 +++++++++++++++++++++++++++++------------ resources/langs/nheko_fi.ts | 122 +++++++++++++++++++++++++---------- resources/langs/nheko_fr.ts | 123 ++++++++++++++++++++++++++---------- resources/langs/nheko_ja.ts | 122 +++++++++++++++++++++++++---------- resources/langs/nheko_nl.ts | 122 +++++++++++++++++++++++++---------- resources/langs/nheko_pl.ts | 122 +++++++++++++++++++++++++---------- resources/langs/nheko_ru.ts | 122 +++++++++++++++++++++++++---------- resources/langs/nheko_zh_CN.ts | 122 +++++++++++++++++++++++++---------- 11 files changed, 920 insertions(+), 333 deletions(-) create mode 100644 resources/langs/nheko_en.qm (limited to 'resources') diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts index 3f9cdc52..fcbf8b31 100644 --- a/resources/langs/nheko_de.ts +++ b/resources/langs/nheko_de.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + Du bist dem Raum beigetreten. + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 Eingeladener Benutzer: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + Migrieren des Caches auf die aktuelle Version fehlgeschlagen. Das kann verschiedene Gründe als Ursache haben. Bitte lege einen Bugreport an und verwende in der Zwischenzeit eine ältere Version. Alternativ kannst du das Cache manuell entfernen. + + + + Room %1 created. + Raum %1 erzeugt. + + + Failed to invite %1 to %2: %3 Einladung von %1 in Raum %2 fehlgeschlagen: %3 @@ -50,29 +68,24 @@ Verbannung von %1 wurde aufgehoben. - + Failed to upload media. Please try again. Medienupload fehlgeschlagen. Bitte versuche es erneut. Cache migration failed! - - - - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - + Cache migration fehlgeschlagen! - + Incompatible cache version - + Inkompatible Cacheversion The cache on your disk is newer than this version of Nheko supports. Please update or clear your cache. - + Das Cache auf der Festplatte wurde mit einer neueren Nheko version angelegt. Bitte aktualisiere Nheko oder entferne das Cache. @@ -91,7 +104,7 @@ - + Please try to login again: %1 Bitte melde dich erneut an: %1 @@ -116,12 +129,7 @@ Raum konnte nicht erstellt werden: %1 - - Room %1 created - Raum %1 wurde erstellt. - - - + Failed to leave room: %1 Konnte den Raum nicht verlassen: %1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID Matrix-ID @@ -207,22 +215,46 @@ z.B. @joe:matrix.org - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + Dein Anmeldename. Eine mxid sollte mit einem @ anfangen, gefolgt von dem Benutzernamen. Nach dem Benutzernamen sollten ein Doppelpunkt (:) under der Servername folgen. +Nach dem Doppelpunkt kann alternativ die Serveradresse (mit oder ohne Port) angegeben werden, wenn der Server nicht per .well-known auffindbar ist. +Beispiel: @benutzer:dein.server +Wenn Nheko deinen Server nicht automatisch erkennen kann, wird es dich nach dem Server fragen. + + + Password Passwort - + Device name Gerätename - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + Ein Name für dieses Gerät. Dieser wird anderen angezeigt, wenn sie dieses Gerät verifizieren. Wenn kein Name angegeben wurde, wird automatisch ein zufälliger Name erzeugt, der keine Rückschlüsse auf deine Identität zulassen sollte. + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + Die Adresse unter der dein Heimserver erreichbar ist. +Beispiel: https://mein.server:8787 + + + + LOGIN ANMELDEN - + Autodiscovery failed. Received malformed response. Automatische Erkennung fehlgeschlagen. Antwort war fehlerhaft. @@ -232,7 +264,7 @@ Automatische Erkennung fehlgeschlagen. Unbekannter Fehler bei Anfrage .well-known. - + The required endpoints were not found. Possibly not a Matrix server. Benötigte Ansprechpunkte nicht auffindbar. Möglicherweise kein Matrixserver. @@ -247,10 +279,20 @@ Ein unbekannter Fehler ist aufgetreten. Bitte Homeserverdomain prüfen. - + + SSO LOGIN + SSO ANMELDUNG + + + Empty password Leeres Passwort + + + SSO login failed + SSO Anmeldung fehlgeschlagen + MemberList @@ -328,9 +370,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + Der Benutzername sollte nicht leer sein und nur aus a-z, 0-9, ., _, =, - und / bestehen. + + + Password Passwort + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + Bitte wähle ein sicheres Passwort. Die genauen Anforderungen bestimmt dein Server. + Password confirmation @@ -338,11 +390,16 @@ - Home Server - Homeserver + Homeserver + Heimserver - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + Ein Server, der Registrierungen zulässt. Weil Matrix ein dezentralisiertes Protokoll ist, musst du erst einen Server ausfindig machen oder einen persönlichen Server aufsetzen. + + + REGISTER REGISTRIEREN @@ -375,7 +432,7 @@ RoomInfo - + no version stored keine Version gespeichert @@ -491,7 +548,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. -- Entschlüsselungsfehler (Fehler bei Kommunikation mit Datenbank) -- @@ -660,7 +717,12 @@ %1 hat das Anklopfen zurückgezogen. - + + You joined this room. + Du bist dem Raum beigetreten. + + + Rejected the knock from %1. Hat das Anklopfen von %1 abgewiesen. @@ -684,7 +746,7 @@ TimelineRow - + Reply Antworten @@ -697,7 +759,7 @@ TimelineView - + Reply Antworten @@ -737,7 +799,7 @@ Kein Raum geöffnet - + Close Schließen @@ -826,7 +888,7 @@ Show buttons in timeline - + Zeige Buttons in der Historie @@ -1044,7 +1106,7 @@ Open Fallback in Browser - Öffne Fallback im Browser + Öffne Fallback im Browser diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts index 7cd94593..39ed1442 100644 --- a/resources/langs/nheko_el.ts +++ b/resources/langs/nheko_el.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + + + + + Room %1 created. + + + + Failed to invite %1 to %2: %3 @@ -50,7 +68,7 @@ - + Failed to upload media. Please try again. @@ -60,12 +78,7 @@ - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - - - - + Incompatible cache version @@ -91,7 +104,7 @@ - + Please try to login again: %1 @@ -116,12 +129,7 @@ - - Room %1 created - - - - + Failed to leave room: %1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID Matrix ID @@ -207,22 +215,42 @@ π.χ @john:matrix.org - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + + + + Password Κωδικός - + Device name - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + + + + + LOGIN ΕΙΣΟΔΟΣ - + Autodiscovery failed. Received malformed response. @@ -232,7 +260,7 @@ - + The required endpoints were not found. Possibly not a Matrix server. @@ -247,10 +275,20 @@ - + + SSO LOGIN + + + + Empty password Κενός κωδικός + + + SSO login failed + + MemberList @@ -328,9 +366,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + + + + Password Κωδικός + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + + Password confirmation @@ -338,11 +386,16 @@ - Home Server - Διακομιστής + Homeserver + - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + + + + REGISTER ΕΓΓΡΑΦΗ @@ -375,7 +428,7 @@ RoomInfo - + no version stored @@ -491,7 +544,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. @@ -660,7 +713,12 @@ - + + You joined this room. + + + + Rejected the knock from %1. @@ -684,7 +742,7 @@ TimelineRow - + Reply @@ -697,7 +755,7 @@ TimelineView - + Reply @@ -737,7 +795,7 @@ - + Close diff --git a/resources/langs/nheko_en.qm b/resources/langs/nheko_en.qm new file mode 100644 index 00000000..0973db2d Binary files /dev/null and b/resources/langs/nheko_en.qm differ diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts index 10295fcf..e7631462 100644 --- a/resources/langs/nheko_en.ts +++ b/resources/langs/nheko_en.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + You joined this room. + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 Invited user: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + + + + Room %1 created. + Room %1 created. + + + Failed to invite %1 to %2: %3 Failed to invite %1 to %2: %3 @@ -50,29 +68,24 @@ Unbanned user: %1 - + Failed to upload media. Please try again. Failed to upload media. Please try again. Cache migration failed! - + Cache migration failed! - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - - - - + Incompatible cache version - + Incompatible cache version The cache on your disk is newer than this version of Nheko supports. Please update or clear your cache. - + The cache on your disk is newer than this version of Nheko supports. Please update or clear your cache. @@ -91,7 +104,7 @@ - + Please try to login again: %1 Please try to login again: %1 @@ -116,12 +129,7 @@ Room creation failed: %1 - - Room %1 created - Room %1 created. - - - + Failed to leave room: %1 Failed to leave room: %1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID Matrix ID @@ -207,22 +215,46 @@ e.g @joe:matrix.org - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + + + Password Password - + Device name Device name - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + + + + LOGIN LOGIN - + Autodiscovery failed. Received malformed response. Autodiscovery failed. Received malformed response. @@ -232,7 +264,7 @@ Autodiscovery failed. Unknown error while requesting .well-known. - + The required endpoints were not found. Possibly not a Matrix server. The required endpoints were not found. Possibly not a Matrix server. @@ -247,10 +279,20 @@ An unknown error occured. Make sure the homeserver domain is valid. - + + SSO LOGIN + SSO LOGIN + + + Empty password Empty password + + + SSO login failed + SSO login failed + MemberList @@ -328,9 +370,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + + + Password Password + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + Please choose a secure password. The exact requirements for password strength may depend on your server. + Password confirmation @@ -338,11 +390,16 @@ - Home Server - Home Server + Homeserver + Homeserver - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + + + REGISTER REGISTER @@ -375,7 +432,7 @@ RoomInfo - + no version stored no version stored @@ -491,7 +548,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. -- Decryption Error (failed to communicate with DB) -- @@ -550,8 +607,8 @@ %1 and %2 are typing. 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.) - %1%2 is typing - %1 and %2 are typing + %1%2 is typing. + %1 and %2 are typing. @@ -660,7 +717,12 @@ %1 redacted their knock. - + + You joined this room. + You joined this room. + + + Rejected the knock from %1. Rejected the knock from %1. @@ -684,7 +746,7 @@ TimelineRow - + Reply Reply @@ -697,7 +759,7 @@ TimelineView - + Reply Reply @@ -719,7 +781,7 @@ View decrypted raw message - + View decrypted raw message @@ -737,7 +799,7 @@ No room open - + Close Close @@ -821,7 +883,7 @@ Decrypt messages in sidebar - + Decrypt messages in sidebar diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts index 0f0cf1ac..01b9d75d 100644 --- a/resources/langs/nheko_fi.ts +++ b/resources/langs/nheko_fi.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + + + + + Room %1 created. + + + + Failed to invite %1 to %2: %3 @@ -50,7 +68,7 @@ - + Failed to upload media. Please try again. @@ -60,12 +78,7 @@ - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - - - - + Incompatible cache version @@ -91,7 +104,7 @@ - + Please try to login again: %1 Ole hyvä ja yritä kirjautua sisään uudelleen: %1 @@ -116,12 +129,7 @@ Huoneen luominen epäonnistui: %1 - - Room %1 created - - - - + Failed to leave room: %1 Huoneesta poistuminen epäonnistui: %1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID Matrix-tunnus @@ -207,22 +215,42 @@ esim. @joe:matrix.org - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + + + + Password Salasana - + Device name Laitteen nimi - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + + + + + LOGIN KIRJAUDU - + Autodiscovery failed. Received malformed response. Palvelimen tietojen hakeminen epäonnistui: virheellinen vastaus. @@ -232,7 +260,7 @@ Palvelimen tietojen hakeminen epäonnistui: tuntematon virhe hakiessa .well-known -tiedostoa. - + The required endpoints were not found. Possibly not a Matrix server. Vaadittuja päätepisteitä ei löydetty. Mahdollisesti ei Matrix-palvelin. @@ -247,10 +275,20 @@ Tapahtui tuntematon virhe. Varmista, että kotipalvelimen osoite on pätevä. - + + SSO LOGIN + + + + Empty password Tyhjä salasana + + + SSO login failed + + MemberList @@ -328,9 +366,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + + + + Password Salasana + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + + Password confirmation @@ -338,11 +386,16 @@ - Home Server - Kotipalvelin + Homeserver + - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + + + + REGISTER REKISTERÖIDY @@ -375,7 +428,7 @@ RoomInfo - + no version stored ei tallennettua versiota @@ -491,7 +544,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. -- Virhe purkaessa salausta (tietokannan kanssa kommunikointi epäonnistui) -- @@ -660,7 +713,12 @@ - + + You joined this room. + + + + Rejected the knock from %1. @@ -684,7 +742,7 @@ TimelineRow - + Reply @@ -697,7 +755,7 @@ TimelineView - + Reply @@ -737,7 +795,7 @@ - + Close Sulje diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts index 3668e53e..9e47702b 100644 --- a/resources/langs/nheko_fr.ts +++ b/resources/langs/nheko_fr.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + + + + + Room %1 created. + + + + Failed to invite %1 to %2: %3 @@ -50,7 +68,7 @@ - + Failed to upload media. Please try again. @@ -60,12 +78,7 @@ - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - - - - + Incompatible cache version @@ -91,7 +104,7 @@ - + Please try to login again: %1 @@ -116,12 +129,7 @@ - - Room %1 created - - - - + Failed to leave room: %1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID Identifiant Matrix @@ -207,22 +215,42 @@ ex : @joe:matrix.org - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + + + + Password Mot de passe - + Device name - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + + + + + LOGIN CONNEXION - + Autodiscovery failed. Received malformed response. @@ -232,7 +260,7 @@ - + The required endpoints were not found. Possibly not a Matrix server. @@ -247,10 +275,20 @@ - + + SSO LOGIN + + + + Empty password Mot de passe vide + + + SSO login failed + + MemberList @@ -328,9 +366,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + + + + Password Mot de passe + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + + Password confirmation @@ -338,12 +386,16 @@ - Home Server - À affiner... - Serveur Matrix + Homeserver + - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + + + + REGISTER S'ENREGISTRER @@ -376,7 +428,7 @@ RoomInfo - + no version stored @@ -492,7 +544,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. @@ -661,7 +713,12 @@ - + + You joined this room. + + + + Rejected the knock from %1. @@ -685,7 +742,7 @@ TimelineRow - + Reply @@ -698,7 +755,7 @@ TimelineView - + Reply @@ -738,7 +795,7 @@ - + Close diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts index c6f38fed..049c4189 100644 --- a/resources/langs/nheko_ja.ts +++ b/resources/langs/nheko_ja.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 招待されたユーザー: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + + + + + Room %1 created. + + + + Failed to invite %1 to %2: %3 %2に%1を招待できませんでした: %3 @@ -50,7 +68,7 @@ 永久追放を解除されたユーザー: %1 - + Failed to upload media. Please try again. メディアをアップロードできませんでした。やり直して下さい。 @@ -60,12 +78,7 @@ - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - - - - + Incompatible cache version @@ -91,7 +104,7 @@ - + Please try to login again: %1 もう一度ログインしてみて下さい: %1 @@ -116,12 +129,7 @@ 部屋を作成できませんでした: %1 - - Room %1 created - 部屋 %1 を作成しました - - - + Failed to leave room: %1 部屋から出られませんでした: %1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID Matrix ID @@ -207,22 +215,42 @@ 例 @joe:matrix.org - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + + + + Password パスワード - + Device name デバイス名 - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + + + + + LOGIN ログイン - + Autodiscovery failed. Received malformed response. 自動検出できませんでした。不正な形式の応答を受信しました。 @@ -232,7 +260,7 @@ 自動検出できませんでした。.well-known要求時の不明なエラー。 - + The required endpoints were not found. Possibly not a Matrix server. 必要な端点が見つかりません。Matrixサーバーではないかもしれません。 @@ -247,10 +275,20 @@ 不明なエラーが発生しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。 - + + SSO LOGIN + + + + Empty password パスワードが入力されていません + + + SSO login failed + + MemberList @@ -328,9 +366,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + + + + Password パスワード + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + + Password confirmation @@ -338,11 +386,16 @@ - Home Server - ホームサーバー + Homeserver + - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + + + + REGISTER 登録 @@ -375,7 +428,7 @@ RoomInfo - + no version stored バージョンが保存されていません @@ -491,7 +544,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. -- 復号エラー (データベースと通信できませんでした) -- @@ -659,7 +712,12 @@ %1がノックを編集しました。 - + + You joined this room. + + + + Rejected the knock from %1. %1からのノックを拒否しました。 @@ -683,7 +741,7 @@ TimelineRow - + Reply 返信 @@ -696,7 +754,7 @@ TimelineView - + Reply 返信 @@ -736,7 +794,7 @@ 部屋が開いていません - + Close 閉じる diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts index f70e1fef..205de986 100644 --- a/resources/langs/nheko_nl.ts +++ b/resources/langs/nheko_nl.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + + + + + Room %1 created. + + + + Failed to invite %1 to %2: %3 @@ -50,7 +68,7 @@ - + Failed to upload media. Please try again. @@ -60,12 +78,7 @@ - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - - - - + Incompatible cache version @@ -91,7 +104,7 @@ - + Please try to login again: %1 @@ -116,12 +129,7 @@ - - Room %1 created - - - - + Failed to leave room: %1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID Matrix-id @@ -207,22 +215,42 @@ b.v @jan:matrix.org< - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + + + + Password Wachtwoord - + Device name - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + + + + + LOGIN INLOGGEN - + Autodiscovery failed. Received malformed response. @@ -232,7 +260,7 @@ - + The required endpoints were not found. Possibly not a Matrix server. @@ -247,10 +275,20 @@ - + + SSO LOGIN + + + + Empty password Leeg wachtwoord + + + SSO login failed + + MemberList @@ -328,9 +366,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + + + + Password Wachtwoord + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + + Password confirmation @@ -338,11 +386,16 @@ - Home Server - Thuisserver + Homeserver + - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + + + + REGISTER REGISTREREN @@ -375,7 +428,7 @@ RoomInfo - + no version stored @@ -491,7 +544,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. @@ -660,7 +713,12 @@ - + + You joined this room. + + + + Rejected the knock from %1. @@ -684,7 +742,7 @@ TimelineRow - + Reply @@ -697,7 +755,7 @@ TimelineView - + Reply @@ -737,7 +795,7 @@ - + Close diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts index 07ecf4a4..c089a5b4 100644 --- a/resources/langs/nheko_pl.ts +++ b/resources/langs/nheko_pl.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + + + + + Room %1 created. + + + + Failed to invite %1 to %2: %3 @@ -50,7 +68,7 @@ - + Failed to upload media. Please try again. @@ -60,12 +78,7 @@ - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - - - - + Incompatible cache version @@ -91,7 +104,7 @@ - + Please try to login again: %1 Spróbuj zalogować się ponownie: %1 @@ -116,12 +129,7 @@ Tworzenie pokoju nie powiodło się: %1 - - Room %1 created - - - - + Failed to leave room: %1 Nie udało się opuścić pokoju: %1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID ID Matrixa @@ -207,22 +215,42 @@ np. @joe:matrix.org - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + + + + Password Hasło - + Device name Nazwa urządzenia - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + + + + + LOGIN ZALOGUJ - + Autodiscovery failed. Received malformed response. @@ -232,7 +260,7 @@ - + The required endpoints were not found. Possibly not a Matrix server. Nie odnaleziono wymaganych punktów końcowych. To może nie być serwer Matriksa. @@ -247,10 +275,20 @@ Wystąpił nieznany błąd. Upewnij się, że domena serwera domowego jest prawidłowa. - + + SSO LOGIN + + + + Empty password Puste hasło + + + SSO login failed + + MemberList @@ -328,9 +366,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + + + + Password Hasło + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + + Password confirmation @@ -338,11 +386,16 @@ - Home Server - Serwer domowy + Homeserver + - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + + + + REGISTER ZAREJESTRUJ @@ -375,7 +428,7 @@ RoomInfo - + no version stored @@ -491,7 +544,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. @@ -661,7 +714,12 @@ - + + You joined this room. + + + + Rejected the knock from %1. @@ -685,7 +743,7 @@ TimelineRow - + Reply @@ -698,7 +756,7 @@ TimelineView - + Reply @@ -738,7 +796,7 @@ - + Close diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts index 25abbe40..761110f0 100644 --- a/resources/langs/nheko_ru.ts +++ b/resources/langs/nheko_ru.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + + + + + Room %1 created. + + + + Failed to invite %1 to %2: %3 @@ -50,7 +68,7 @@ - + Failed to upload media. Please try again. @@ -60,12 +78,7 @@ - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - - - - + Incompatible cache version @@ -91,7 +104,7 @@ - + Please try to login again: %1 Повторите попытку входа: %1 @@ -116,12 +129,7 @@ Не удалось создать комнату: %1 - - Room %1 created - - - - + Failed to leave room: %1 Не удалось покинуть комнату: %1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID Идентификатор Matrix @@ -207,22 +215,42 @@ Пример: @joe:matrix.org - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + + + + Password Пароль - + Device name Имя устройства - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + + + + + LOGIN ВОЙТИ - + Autodiscovery failed. Received malformed response. @@ -232,7 +260,7 @@ - + The required endpoints were not found. Possibly not a Matrix server. Необходимые конечные точки не найдены. Возможно, это не сервер Matrix. @@ -247,10 +275,20 @@ Произошла неизвестная ошибка. Убедитесь, что домен homeserver действителен. - + + SSO LOGIN + + + + Empty password Пустой пароль + + + SSO login failed + + MemberList @@ -328,9 +366,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + + + + Password Пароль + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + + Password confirmation @@ -338,11 +386,16 @@ - Home Server - Домашний сервер + Homeserver + - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + + + + REGISTER РЕГИСТРАЦИЯ @@ -375,7 +428,7 @@ RoomInfo - + no version stored @@ -491,7 +544,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. @@ -661,7 +714,12 @@ - + + You joined this room. + + + + Rejected the knock from %1. @@ -685,7 +743,7 @@ TimelineRow - + Reply @@ -698,7 +756,7 @@ TimelineView - + Reply @@ -738,7 +796,7 @@ - + Close Закрыть diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts index ddd8c017..5b080b74 100644 --- a/resources/langs/nheko_zh_CN.ts +++ b/resources/langs/nheko_zh_CN.ts @@ -1,6 +1,14 @@ + + Cache + + + You joined this room. + + + ChatPage @@ -10,12 +18,22 @@ - + Invited user: %1 - + + Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually. + + + + + Room %1 created. + + + + Failed to invite %1 to %2: %3 @@ -50,7 +68,7 @@ - + Failed to upload media. Please try again. @@ -60,12 +78,7 @@ - - Migrating the cache to the current version failed. This can have different reasons. Please open an issue and try to use an older version in the mean time. Alternatively you can try deleting the cache manually - - - - + Incompatible cache version @@ -91,7 +104,7 @@ - + Please try to login again: %1 请尝试再次登录：%1 @@ -116,12 +129,7 @@ 创建聊天室失败：%1 - - Room %1 created - - - - + Failed to leave room: %1 离开聊天室失败：%1 @@ -197,7 +205,7 @@ LoginPage - + Matrix ID @@ -207,22 +215,42 @@ 例如 @joe:matrix.org - + + Your login name. A mxid should start with @ followed by the user id. After the user id you need to include your server name after a :. +You can also put your homeserver address there, if your server doesn't support .well-known lookup. +Example: @user:server.my +If Nheko fails to discover your homeserver, it will show you a field to enter the server manually. + + + + Password 密码 - + Device name 设备名 - + + A name for this device, which will be shown to others, when verifying your devices. If none is provided, a random string is used for privacy purposes. + + + + + The address that can be used to contact you homeservers client API. +Example: https://server.my:8787 + + + + + LOGIN 登录 - + Autodiscovery failed. Received malformed response. @@ -232,7 +260,7 @@ - + The required endpoints were not found. Possibly not a Matrix server. 没找到要求的终端。可能不是一个 Matrix 服务器。 @@ -247,10 +275,20 @@ 发生了一个未知错误。请确认服务器域名合法。 - + + SSO LOGIN + + + + Empty password 空密码 + + + SSO login failed + + MemberList @@ -328,9 +366,19 @@ + The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /. + + + + Password 密码 + + + Please choose a secure password. The exact requirements for password strength may depend on your server. + + Password confirmation @@ -338,11 +386,16 @@ - Home Server - 服务器 + Homeserver + - + + A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own. + + + + REGISTER 注册 @@ -375,7 +428,7 @@ RoomInfo - + no version stored @@ -491,7 +544,7 @@ TimelineModel - + -- Decryption Error (failed to communicate with DB) -- Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session. @@ -659,7 +712,12 @@ - + + You joined this room. + + + + Rejected the knock from %1. @@ -683,7 +741,7 @@ TimelineRow - + Reply @@ -696,7 +754,7 @@ TimelineView - + Reply @@ -736,7 +794,7 @@ - + Close -- cgit 1.5.1 From 004d10bfeedb5e4278beafbd6b2f288b9b106a26 Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Wed, 13 May 2020 01:09:40 +0200 Subject: Clip replies by default In the future we should probably add a gradient when clipped... --- resources/qml/delegates/ImageMessage.qml | 7 ++++--- resources/qml/delegates/MessageDelegate.qml | 2 ++ resources/qml/delegates/NoticeMessage.qml | 2 ++ resources/qml/delegates/PlayableMediaMessage.qml | 10 ++++++++-- resources/qml/delegates/Reply.qml | 1 + resources/qml/delegates/TextMessage.qml | 2 ++ 6 files changed, 19 insertions(+), 5 deletions(-) (limited to 'resources') diff --git a/resources/qml/delegates/ImageMessage.qml b/resources/qml/delegates/ImageMessage.qml index c7e6d127..62d9de60 100644 --- a/resources/qml/delegates/ImageMessage.qml +++ b/resources/qml/delegates/ImageMessage.qml @@ -6,10 +6,11 @@ Item { 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 bool tooHigh: tempHeight > timelineRoot.height / 2 + property double divisor: model.isReply ? 4 : 2 + property bool tooHigh: tempHeight > timelineRoot.height / divisor - height: tooHigh ? timelineRoot.height / 2 : tempHeight - width: tooHigh ? (timelineRoot.height / 2) / model.data.proportionalHeight : tempWidth + height: tooHigh ? timelineRoot.height / divisor : tempHeight + width: tooHigh ? (timelineRoot.height / divisor) / model.data.proportionalHeight : tempWidth Image { id: blurhash diff --git a/resources/qml/delegates/MessageDelegate.qml b/resources/qml/delegates/MessageDelegate.qml index ff103459..17fe7360 100644 --- a/resources/qml/delegates/MessageDelegate.qml +++ b/resources/qml/delegates/MessageDelegate.qml @@ -6,9 +6,11 @@ Item { Item { id: model property var data; + property bool isReply: false } property alias modelData: model.data + property alias isReply: model.isReply height: chooser.childrenRect.height property real implicitWidth: (chooser.child && chooser.child.implicitWidth) ? chooser.child.implicitWidth : width diff --git a/resources/qml/delegates/NoticeMessage.qml b/resources/qml/delegates/NoticeMessage.qml index 62ada6d1..be348329 100644 --- a/resources/qml/delegates/NoticeMessage.qml +++ b/resources/qml/delegates/NoticeMessage.qml @@ -1,4 +1,6 @@ TextMessage { font.italic: true color: colors.buttonText + height: isReply ? Math.min(chat.height / 8, implicitHeight) : undefined + clip: true } diff --git a/resources/qml/delegates/PlayableMediaMessage.qml b/resources/qml/delegates/PlayableMediaMessage.qml index 20177a04..bab524eb 100644 --- a/resources/qml/delegates/PlayableMediaMessage.qml +++ b/resources/qml/delegates/PlayableMediaMessage.qml @@ -20,8 +20,14 @@ Rectangle { Rectangle { id: videoContainer visible: model.data.type == MtxEvent.VideoMessage - width: Math.min(parent.width, model.data.width ? model.data.width : 400) // some media has 0 as size... - height: width*model.data.proportionalHeight + property double tempWidth: Math.min(parent ? parent.width : undefined, model.data.width < 1 ? 400 : model.data.width) + property double tempHeight: tempWidth * model.data.proportionalHeight + + property double divisor: model.isReply ? 4 : 2 + property bool tooHigh: tempHeight > timelineRoot.height / divisor + + height: tooHigh ? timelineRoot.height / divisor : tempHeight + width: tooHigh ? (timelineRoot.height / divisor) / model.data.proportionalHeight : tempWidth Image { anchors.fill: parent source: model.data.thumbnailUrl.replace("mxc://", "image://MxcImage/") diff --git a/resources/qml/delegates/Reply.qml b/resources/qml/delegates/Reply.qml index 90013de9..f9fd3f11 100644 --- a/resources/qml/delegates/Reply.qml +++ b/resources/qml/delegates/Reply.qml @@ -51,6 +51,7 @@ Item { MessageDelegate { id: reply width: parent.width + isReply: true } } diff --git a/resources/qml/delegates/TextMessage.qml b/resources/qml/delegates/TextMessage.qml index 7e4b1f29..bef4f76d 100644 --- a/resources/qml/delegates/TextMessage.qml +++ b/resources/qml/delegates/TextMessage.qml @@ -4,4 +4,6 @@ MatrixText { property string formatted: model.data.formattedBody text: "" + formatted.replace("
", "
")
 	width: parent ? parent.width : undefined
+	height: isReply ? Math.min(chat.height / 8, implicitHeight) : undefined
+	clip: true
 }
-- 
cgit 1.5.1


From d6981355d37db3ec3fda9a5a911cda1c82ab6cca Mon Sep 17 00:00:00 2001
From: Nicolas Werner 
Date: Wed, 13 May 2020 23:32:39 +0200
Subject: Align scrolling to pixels manually

---
 resources/qml/ScrollHelper.qml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'resources')

diff --git a/resources/qml/ScrollHelper.qml b/resources/qml/ScrollHelper.qml
index 3a8868f5..cdb4a23a 100644
--- a/resources/qml/ScrollHelper.qml
+++ b/resources/qml/ScrollHelper.qml
@@ -71,6 +71,8 @@ MouseArea {
             pixelDelta = wheel.pixelDelta.y
         }
 
+	pixelDelta = Math.round(pixelDelta)
+
         if (!pixelDelta) {
             return flickableItem.contentY;
         }
-- 
cgit 1.5.1


From 2c3d09edbb3236e8f3c8f41f23420615906bb158 Mon Sep 17 00:00:00 2001
From: Nicolas Werner 
Date: Wed, 13 May 2020 23:55:02 +0200
Subject: Try to smooth scrolling a bit by increasing cacheBuffer

---
 resources/qml/TimelineView.qml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'resources')

diff --git a/resources/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index eca646d1..15cafd8c 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -109,6 +109,8 @@ Page {
 
 			visible: timelineManager.timeline != null
 
+			cacheBuffer: 500
+
 			anchors.left: parent.left
 			anchors.right: parent.right
 			anchors.top: parent.top
-- 
cgit 1.5.1


From 18f934efad19821bb2932ba687b2f3c42735add2 Mon Sep 17 00:00:00 2001
From: Joseph Donofry 
Date: Thu, 14 May 2020 20:35:29 -0400
Subject: Add un-encrypted warning icon for messages in encrypted rooms

---
 resources/icons/ui/unlock.png         | Bin 0 -> 385 bytes
 resources/icons/ui/unlock@2x.png      | Bin 0 -> 741 bytes
 resources/langs/nheko_de.ts           |  15 ++++++++++-----
 resources/langs/nheko_el.ts           |  15 ++++++++++-----
 resources/langs/nheko_en.ts           |  15 ++++++++++-----
 resources/langs/nheko_fi.ts           |  15 ++++++++++-----
 resources/langs/nheko_fr.ts           |  15 ++++++++++-----
 resources/langs/nheko_ja.ts           |  15 ++++++++++-----
 resources/langs/nheko_nl.ts           |  15 ++++++++++-----
 resources/langs/nheko_pl.ts           |  15 ++++++++++-----
 resources/langs/nheko_ru.ts           |  15 ++++++++++-----
 resources/langs/nheko_zh_CN.ts        |  15 ++++++++++-----
 resources/qml/EncryptionIndicator.qml |  19 +++++++++++++++++--
 resources/qml/TimelineRow.qml         |   3 ++-
 resources/res.qrc                     |   2 ++
 src/timeline/TimelineModel.cpp        |   5 +++++
 src/timeline/TimelineModel.h          |   1 +
 17 files changed, 127 insertions(+), 53 deletions(-)
 create mode 100644 resources/icons/ui/unlock.png
 create mode 100644 resources/icons/ui/unlock@2x.png

(limited to 'resources')

diff --git a/resources/icons/ui/unlock.png b/resources/icons/ui/unlock.png
new file mode 100644
index 00000000..90e4602a
Binary files /dev/null and b/resources/icons/ui/unlock.png differ
diff --git a/resources/icons/ui/unlock@2x.png b/resources/icons/ui/unlock@2x.png
new file mode 100644
index 00000000..8df18143
Binary files /dev/null and b/resources/icons/ui/unlock@2x.png differ
diff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index fcbf8b31..2b5a5393 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         Verschlüsselt
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -310,7 +315,7 @@ Beispiel: https://mein.server:8787
 
     MessageDelegate
     
-        
+        
         redacted
         gelöscht
     
@@ -548,7 +553,7 @@ Beispiel: https://mein.server:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         -- Entschlüsselungsfehler (Fehler bei Kommunikation mit Datenbank) --
@@ -746,7 +751,7 @@ Beispiel: https://mein.server:8787
 
     TimelineRow
     
-        
+        
         Reply
         Antworten
     
@@ -799,7 +804,7 @@ Beispiel: https://mein.server:8787
         Kein Raum geöffnet
     
     
-        
+        
         Close
         Schließen
     
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index 39ed1442..a6e4ff7d 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -306,7 +311,7 @@ Example: https://server.my:8787
 
     MessageDelegate
     
-        
+        
         redacted
         
     
@@ -544,7 +549,7 @@ Example: https://server.my:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         
@@ -742,7 +747,7 @@ Example: https://server.my:8787
 
     TimelineRow
     
-        
+        
         Reply
         
     
@@ -795,7 +800,7 @@ Example: https://server.my:8787
         
     
     
-        
+        
         Close
         
     
diff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index e7631462..1fd9b86c 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         Encrypted
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -310,7 +315,7 @@ Example: https://server.my:8787
 
     MessageDelegate
     
-        
+        
         redacted
         redacted
     
@@ -548,7 +553,7 @@ Example: https://server.my:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         -- Decryption Error (failed to communicate with DB) --
@@ -746,7 +751,7 @@ Example: https://server.my:8787
 
     TimelineRow
     
-        
+        
         Reply
         Reply
     
@@ -799,7 +804,7 @@ Example: https://server.my:8787
         No room open
     
     
-        
+        
         Close
         Close
     
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 01b9d75d..069fb6b2 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -306,7 +311,7 @@ Example: https://server.my:8787
 
     MessageDelegate
     
-        
+        
         redacted
         
     
@@ -544,7 +549,7 @@ Example: https://server.my:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         -- Virhe purkaessa salausta (tietokannan kanssa kommunikointi epäonnistui) --
@@ -742,7 +747,7 @@ Example: https://server.my:8787
 
     TimelineRow
     
-        
+        
         Reply
         
     
@@ -795,7 +800,7 @@ Example: https://server.my:8787
         
     
     
-        
+        
         Close
         Sulje
     
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index 9e47702b..d50b5fb8 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -306,7 +311,7 @@ Example: https://server.my:8787
 
     MessageDelegate
     
-        
+        
         redacted
         
     
@@ -544,7 +549,7 @@ Example: https://server.my:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         
@@ -742,7 +747,7 @@ Example: https://server.my:8787
 
     TimelineRow
     
-        
+        
         Reply
         
     
@@ -795,7 +800,7 @@ Example: https://server.my:8787
         
     
     
-        
+        
         Close
         
     
diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
index 049c4189..63522065 100644
--- a/resources/langs/nheko_ja.ts
+++ b/resources/langs/nheko_ja.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         暗号化されています
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -306,7 +311,7 @@ Example: https://server.my:8787
 
     MessageDelegate
     
-        
+        
         redacted
         編集済み
     
@@ -544,7 +549,7 @@ Example: https://server.my:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         -- 復号エラー (データベースと通信できませんでした) --
@@ -741,7 +746,7 @@ Example: https://server.my:8787
 
     TimelineRow
     
-        
+        
         Reply
         返信
     
@@ -794,7 +799,7 @@ Example: https://server.my:8787
         部屋が開いていません
     
     
-        
+        
         Close
         閉じる
     
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index 205de986..2c3eeee3 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -306,7 +311,7 @@ Example: https://server.my:8787
 
     MessageDelegate
     
-        
+        
         redacted
         
     
@@ -544,7 +549,7 @@ Example: https://server.my:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         
@@ -742,7 +747,7 @@ Example: https://server.my:8787
 
     TimelineRow
     
-        
+        
         Reply
         
     
@@ -795,7 +800,7 @@ Example: https://server.my:8787
         
     
     
-        
+        
         Close
         
     
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index c089a5b4..f68ca8b3 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -306,7 +311,7 @@ Example: https://server.my:8787
 
     MessageDelegate
     
-        
+        
         redacted
         
     
@@ -544,7 +549,7 @@ Example: https://server.my:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         
@@ -743,7 +748,7 @@ Example: https://server.my:8787
 
     TimelineRow
     
-        
+        
         Reply
         
     
@@ -796,7 +801,7 @@ Example: https://server.my:8787
         
     
     
-        
+        
         Close
         
     
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index 761110f0..95f75081 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -306,7 +311,7 @@ Example: https://server.my:8787
 
     MessageDelegate
     
-        
+        
         redacted
         
     
@@ -544,7 +549,7 @@ Example: https://server.my:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         
@@ -743,7 +748,7 @@ Example: https://server.my:8787
 
     TimelineRow
     
-        
+        
         Reply
         
     
@@ -796,7 +801,7 @@ Example: https://server.my:8787
         
     
     
-        
+        
         Close
         Закрыть
     
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index 5b080b74..6b6c0646 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -189,10 +189,15 @@
 
     EncryptionIndicator
     
-        
+        
         Encrypted
         
     
+    
+        
+        This message is not encrypted!
+        
+    
 
 
     InviteeItem
@@ -306,7 +311,7 @@ Example: https://server.my:8787
 
     MessageDelegate
     
-        
+        
         redacted
         
     
@@ -544,7 +549,7 @@ Example: https://server.my:8787
 
     TimelineModel
     
-        
+        
         -- Decryption Error (failed to communicate with DB) --
         Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.
         
@@ -741,7 +746,7 @@ Example: https://server.my:8787
 
     TimelineRow
     
-        
+        
         Reply
         
     
@@ -794,7 +799,7 @@ Example: https://server.my:8787
         
     
     
-        
+        
         Close
         
     
diff --git a/resources/qml/EncryptionIndicator.qml b/resources/qml/EncryptionIndicator.qml
index 00fe2ee4..428c2fae 100644
--- a/resources/qml/EncryptionIndicator.qml
+++ b/resources/qml/EncryptionIndicator.qml
@@ -3,13 +3,14 @@ import QtQuick.Controls 2.1
 import im.nheko 1.0
 
 Rectangle {
+	property bool encrypted: false
 	id: indicator
 	color: "transparent"
 	width: 16
 	height: 16
 
 	ToolTip.visible: ma.containsMouse && indicator.visible
-	ToolTip.text: qsTr("Encrypted")
+	ToolTip.text: getEncryptionTooltip()
 
 	MouseArea{
 		id: ma
@@ -20,7 +21,21 @@ Rectangle {
 	Image {
 		id: stateImg
 		anchors.fill: parent
-		source: "image://colorimage/:/icons/icons/ui/lock.png?"+colors.buttonText
+		source: getEncryptionImage()
+	}
+
+	function getEncryptionImage() {
+		if (encrypted)
+			return "image://colorimage/:/icons/icons/ui/lock.png?"+colors.buttonText
+		else
+			return "image://colorimage/:/icons/icons/ui/unlock.png?#dd3d3d"
+	}
+
+	function getEncryptionTooltip() {
+		if (encrypted)
+			return qsTr("Encrypted")
+		else
+			return qsTr("This message is not encrypted!")
 	}
 }
 
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 22222ef3..8dcd0056 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -66,7 +66,8 @@ MouseArea {
 		}
 
 		EncryptionIndicator {
-			visible: model.isEncrypted
+			visible: model.isRoomEncrypted
+			encrypted: model.isEncrypted
 			Layout.alignment: Qt.AlignRight | Qt.AlignTop
 			Layout.preferredHeight: 16
 			width: 16
diff --git a/resources/res.qrc b/resources/res.qrc
index 64a5b3cb..a57d0416 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -14,6 +14,8 @@
         icons/ui/double-tick-indicator@2x.png
         icons/ui/lock.png
         icons/ui/lock@2x.png
+        icons/ui/unlock.png
+        icons/ui/unlock@2x.png
         icons/ui/clock.png
         icons/ui/clock@2x.png
         icons/ui/checkmark.png
diff --git a/src/timeline/TimelineModel.cpp b/src/timeline/TimelineModel.cpp
index b7e90034..6e653f10 100644
--- a/src/timeline/TimelineModel.cpp
+++ b/src/timeline/TimelineModel.cpp
@@ -224,6 +224,7 @@ TimelineModel::roleNames() const
           {Id, "id"},
           {State, "state"},
           {IsEncrypted, "isEncrypted"},
+          {IsRoomEncrypted, "isRoomEncrypted"},
           {ReplyTo, "replyTo"},
           {Reactions, "reactions"},
           {RoomId, "roomId"},
@@ -350,6 +351,9 @@ TimelineModel::data(const QString &id, int role) const
                 return std::holds_alternative<
                   mtx::events::EncryptedEvent>(events[id]);
         }
+        case IsRoomEncrypted: {
+                return cache::isRoomEncrypted(room_id_.toStdString());
+        }
         case ReplyTo:
                 return QVariant(QString::fromStdString(in_reply_to_event(event)));
         case Reactions:
@@ -387,6 +391,7 @@ TimelineModel::data(const QString &id, int role) const
                 m.insert(names[Id], data(id, static_cast(Id)));
                 m.insert(names[State], data(id, static_cast(State)));
                 m.insert(names[IsEncrypted], data(id, static_cast(IsEncrypted)));
+                m.insert(names[IsRoomEncrypted], data(id, static_cast(IsRoomEncrypted)));
                 m.insert(names[ReplyTo], data(id, static_cast(ReplyTo)));
                 m.insert(names[RoomName], data(id, static_cast(RoomName)));
                 m.insert(names[RoomTopic], data(id, static_cast(RoomTopic)));
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h
index a737aac7..0e9ddb72 100644
--- a/src/timeline/TimelineModel.h
+++ b/src/timeline/TimelineModel.h
@@ -157,6 +157,7 @@ public:
                 Id,
                 State,
                 IsEncrypted,
+                IsRoomEncrypted,
                 ReplyTo,
                 Reactions,
                 RoomId,
-- 
cgit 1.5.1