diff --git a/resources/icons/ui/unlock.png b/resources/icons/ui/unlock.png
new file mode 100644
index 00000000..90e4602a
--- /dev/null
+++ b/resources/icons/ui/unlock.png
Binary files differdiff --git a/resources/icons/ui/unlock@2x.png b/resources/icons/ui/unlock@2x.png
new file mode 100644
index 00000000..8df18143
--- /dev/null
+++ b/resources/icons/ui/unlock@2x.png
Binary files differdiff --git a/resources/langs/nheko_de.ts b/resources/langs/nheko_de.ts
index ee1e4dd5..90f0e7d3 100644
--- a/resources/langs/nheko_de.ts
+++ b/resources/langs/nheko_de.ts
@@ -5,8 +5,8 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
+ <source>You joined this room.</source>
+ <translation>Du bist dem Raum beigetreten.</translation>
</message>
</context>
<context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation>Eingeladener Benutzer: %1</translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation>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.</translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation>Raum %1 erzeugt.</translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation>Einladung von %1 in Raum %2 fehlgeschlagen: %3</translation>
</message>
@@ -58,29 +68,24 @@
<translation>Verbannung von %1 wurde aufgehoben.</translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation>Medienupload fehlgeschlagen. Bitte versuche es erneut.</translation>
</message>
<message>
<location line="+302"/>
<source>Cache migration failed!</source>
- <translation type="unfinished"></translation>
+ <translation>Cache migration fehlgeschlagen!</translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
- <translation type="unfinished"></translation>
+ <translation>Inkompatible Cacheversion</translation>
</message>
<message>
<location line="+1"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update or clear your cache.</source>
- <translation type="unfinished"></translation>
+ <translation>Das Cache auf der Festplatte wurde mit einer neueren Nheko version angelegt. Bitte aktualisiere Nheko oder entferne das Cache.</translation>
</message>
<message>
<location line="+111"/>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation>Bitte melde dich erneut an: %1</translation>
</message>
@@ -124,12 +129,7 @@
<translation>Raum konnte nicht erstellt werden: %1</translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation>Raum %1 wurde erstellt.</translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation>Konnte den Raum nicht verlassen: %1</translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation>Verschlüsselt</translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation>Matrix-ID</translation>
</message>
@@ -264,22 +269,46 @@
<translation>z.B. @joe:matrix.org</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation>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.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>Passwort</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation>Gerätename</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation>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.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation>Die Adresse unter der dein Heimserver erreichbar ist.
+Beispiel: https://mein.server:8787</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>ANMELDEN</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Automatische Erkennung fehlgeschlagen. Antwort war fehlerhaft.</translation>
</message>
@@ -289,7 +318,7 @@
<translation>Automatische Erkennung fehlgeschlagen. Unbekannter Fehler bei Anfrage .well-known.</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation>Benötigte Ansprechpunkte nicht auffindbar. Möglicherweise kein Matrixserver.</translation>
</message>
@@ -304,10 +333,20 @@
<translation>Ein unbekannter Fehler ist aufgetreten. Bitte Homeserverdomain prüfen.</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation>SSO ANMELDUNG</translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>Leeres Passwort</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation>SSO Anmeldung fehlgeschlagen</translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +364,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation>gelöscht</translation>
</message>
@@ -385,21 +424,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation>Der Benutzername sollte nicht leer sein und nur aus a-z, 0-9, ., _, =, - und / bestehen.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>Passwort</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation>Bitte wähle ein sicheres Passwort. Die genauen Anforderungen bestimmt dein Server.</translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>Passwortbestätigung</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translation>Homeserver</translation>
+ <source>Homeserver</source>
+ <translation>Heimserver</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation>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.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>REGISTRIEREN</translation>
</message>
@@ -548,7 +602,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- Entschlüsselungsfehler (Fehler bei Kommunikation mit Datenbank) --</translation>
@@ -597,12 +651,7 @@
<translation>-- Verschlüsseltes Event (keine Schlüssel zur Entschlüsselung gefunden) --</translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation>-- Verschlüsseltes Event (Unbekannter Eventtyp) --</translation>
@@ -722,7 +771,12 @@
<translation>%1 hat das Anklopfen zurückgezogen.</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation>Du bist dem Raum beigetreten.</translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation>Hat das Anklopfen von %1 abgewiesen.</translation>
</message>
@@ -746,7 +800,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -809,7 +863,7 @@
<translation>Kein Raum geöffnet</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
@@ -898,7 +952,7 @@
<message>
<location line="+1"/>
<source>Show buttons in timeline</source>
- <translation type="unfinished"></translation>
+ <translation>Zeige Buttons in der Historie</translation>
</message>
<message>
<location line="+1"/>
@@ -1116,7 +1170,7 @@
<message>
<location filename="../../src/dialogs/FallbackAuth.cpp" line="+30"/>
<source>Open Fallback in Browser</source>
- <translation type="unfinished">Öffne Fallback im Browser</translation>
+ <translation>Öffne Fallback im Browser</translation>
</message>
<message>
<location line="+1"/>
diff --git a/resources/langs/nheko_el.ts b/resources/langs/nheko_el.ts
index c5351ef3..6c186504 100644
--- a/resources/langs/nheko_el.ts
+++ b/resources/langs/nheko_el.ts
@@ -5,7 +5,7 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
+ <source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
@@ -58,7 +68,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -68,12 +78,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -124,12 +129,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation>Matrix ID</translation>
</message>
@@ -264,22 +269,42 @@
<translation>π.χ @john:matrix.org</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>Κωδικός</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>ΕΙΣΟΔΟΣ</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -289,7 +314,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation type="unfinished"></translation>
</message>
@@ -304,10 +329,20 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>Κενός κωδικός</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +360,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -385,21 +420,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>Κωδικός</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>Επαλήθευση κωδικού</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translation>Διακομιστής</translation>
+ <source>Homeserver</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>ΕΓΓΡΑΦΗ</translation>
</message>
@@ -548,7 +598,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -597,12 +647,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -722,7 +767,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -746,7 +796,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -809,7 +859,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_en.qm b/resources/langs/nheko_en.qm
new file mode 100644
index 00000000..0973db2d
--- /dev/null
+++ b/resources/langs/nheko_en.qm
Binary files differdiff --git a/resources/langs/nheko_en.ts b/resources/langs/nheko_en.ts
index 0220ee09..d6f5336b 100644
--- a/resources/langs/nheko_en.ts
+++ b/resources/langs/nheko_en.ts
@@ -5,8 +5,8 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
+ <source>You joined this room.</source>
+ <translation>You joined this room.</translation>
</message>
</context>
<context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation>Invited user: %1</translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation>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.</translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation>Room %1 created.</translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation>Failed to invite %1 to %2: %3</translation>
</message>
@@ -58,29 +68,24 @@
<translation>Unbanned user: %1</translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation>Failed to upload media. Please try again.</translation>
</message>
<message>
<location line="+302"/>
<source>Cache migration failed!</source>
- <translation type="unfinished"></translation>
+ <translation>Cache migration failed!</translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
- <translation type="unfinished"></translation>
+ <translation>Incompatible cache version</translation>
</message>
<message>
<location line="+1"/>
<source>The cache on your disk is newer than this version of Nheko supports. Please update or clear your cache.</source>
- <translation type="unfinished"></translation>
+ <translation>The cache on your disk is newer than this version of Nheko supports. Please update or clear your cache.</translation>
</message>
<message>
<location line="+111"/>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation>Please try to login again: %1</translation>
</message>
@@ -124,12 +129,7 @@
<translation>Room creation failed: %1</translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation>Room %1 created.</translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation>Failed to leave room: %1</translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation>Encrypted</translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation>Matrix ID</translation>
</message>
@@ -264,22 +269,46 @@
<translation>e.g @joe:matrix.org</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation>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.</translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>Password</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation>Device name</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation>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.</translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>LOGIN</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Autodiscovery failed. Received malformed response.</translation>
</message>
@@ -289,7 +318,7 @@
<translation>Autodiscovery failed. Unknown error while requesting .well-known.</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation>The required endpoints were not found. Possibly not a Matrix server.</translation>
</message>
@@ -304,10 +333,20 @@
<translation>An unknown error occured. Make sure the homeserver domain is valid.</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation>SSO LOGIN</translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>Empty password</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation>SSO login failed</translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +364,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation>redacted</translation>
</message>
@@ -385,21 +424,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>Password</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation>Please choose a secure password. The exact requirements for password strength may depend on your server.</translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>Password confirmation</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translation>Home Server</translation>
+ <source>Homeserver</source>
+ <translation>Homeserver</translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>REGISTER</translation>
</message>
@@ -548,7 +602,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- Decryption Error (failed to communicate with DB) --</translation>
@@ -597,12 +651,7 @@
<translation>-- Encrypted Event (No keys found for decryption) --</translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation>-- Encrypted Event (Unknown event type) --</translation>
@@ -612,8 +661,8 @@
<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>
- <numerusform>%1%2 is typing</numerusform>
- <numerusform>%1 and %2 are typing</numerusform>
+ <numerusform>%1%2 is typing.</numerusform>
+ <numerusform>%1 and %2 are typing.</numerusform>
</translation>
</message>
<message>
@@ -722,7 +771,12 @@
<translation>%1 redacted their knock.</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation>You joined this room.</translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation>Rejected the knock from %1.</translation>
</message>
@@ -746,7 +800,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -791,7 +845,7 @@
<message>
<location line="+6"/>
<source>View decrypted raw message</source>
- <translation type="unfinished"></translation>
+ <translation>View decrypted raw message</translation>
</message>
<message>
<location line="+4"/>
@@ -809,7 +863,7 @@
<translation>No room open</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation>Close</translation>
</message>
@@ -893,7 +947,7 @@
<message>
<location line="+2"/>
<source>Decrypt messages in sidebar</source>
- <translation type="unfinished"></translation>
+ <translation>Decrypt messages in sidebar</translation>
</message>
<message>
<location line="+1"/>
diff --git a/resources/langs/nheko_fi.ts b/resources/langs/nheko_fi.ts
index 712d8ef9..b8aa463f 100644
--- a/resources/langs/nheko_fi.ts
+++ b/resources/langs/nheko_fi.ts
@@ -5,7 +5,7 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
+ <source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
@@ -58,7 +68,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -68,12 +78,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation>Ole hyvä ja yritä kirjautua sisään uudelleen: %1</translation>
</message>
@@ -124,12 +129,7 @@
<translation>Huoneen luominen epäonnistui: %1</translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation>Huoneesta poistuminen epäonnistui: %1</translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation>Matrix-tunnus</translation>
</message>
@@ -264,22 +269,42 @@
<translation>esim. @joe:matrix.org</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>Salasana</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation>Laitteen nimi</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>KIRJAUDU</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>Palvelimen tietojen hakeminen epäonnistui: virheellinen vastaus.</translation>
</message>
@@ -289,7 +314,7 @@
<translation>Palvelimen tietojen hakeminen epäonnistui: tuntematon virhe hakiessa .well-known -tiedostoa.</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation>Vaadittuja päätepisteitä ei löydetty. Mahdollisesti ei Matrix-palvelin.</translation>
</message>
@@ -304,10 +329,20 @@
<translation>Tapahtui tuntematon virhe. Varmista, että kotipalvelimen osoite on pätevä.</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>Tyhjä salasana</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +360,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -385,21 +420,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>Salasana</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>Salasanan varmistus</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translation>Kotipalvelin</translation>
+ <source>Homeserver</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>REKISTERÖIDY</translation>
</message>
@@ -548,7 +598,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can'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>
@@ -597,12 +647,7 @@
<translation type="unfinished">-- Salattu viesti (salauksen purkuavaimia ei löydetty) --</translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished">-- Salattu viesti (tuntematon viestityyppi) --</translation>
@@ -722,7 +767,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -746,7 +796,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -809,7 +859,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished">Sulje</translation>
</message>
diff --git a/resources/langs/nheko_fr.ts b/resources/langs/nheko_fr.ts
index c21fda28..cc8c8238 100644
--- a/resources/langs/nheko_fr.ts
+++ b/resources/langs/nheko_fr.ts
@@ -5,7 +5,7 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
+ <source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
@@ -58,7 +68,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -68,12 +78,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -124,12 +129,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation>Identifiant Matrix</translation>
</message>
@@ -264,22 +269,42 @@
<translation>ex : @joe:matrix.org</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>Mot de passe</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>CONNEXION</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -289,7 +314,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation type="unfinished"></translation>
</message>
@@ -304,10 +329,20 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>Mot de passe vide</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +360,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -385,22 +420,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>Mot de passe</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>Confirmation du mot de passe</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translatorcomment>À affiner...</translatorcomment>
- <translation>Serveur Matrix</translation>
+ <source>Homeserver</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>S'ENREGISTRER</translation>
</message>
@@ -549,7 +598,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -598,12 +647,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -723,7 +767,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -747,7 +796,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -810,7 +859,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_ja.ts b/resources/langs/nheko_ja.ts
index 4101ea2d..aaba8bd4 100644
--- a/resources/langs/nheko_ja.ts
+++ b/resources/langs/nheko_ja.ts
@@ -5,7 +5,7 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
+ <source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation>招待されたユーザー: %1</translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation>%2に%1を招待できませんでした: %3</translation>
</message>
@@ -58,7 +68,7 @@
<translation>永久追放を解除されたユーザー: %1</translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation>メディアをアップロードできませんでした。やり直して下さい。</translation>
</message>
@@ -68,12 +78,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation>もう一度ログインしてみて下さい: %1</translation>
</message>
@@ -124,12 +129,7 @@
<translation>部屋を作成できませんでした: %1</translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation>部屋 %1 を作成しました</translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation>部屋から出られませんでした: %1</translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation>暗号化されています</translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation>Matrix ID</translation>
</message>
@@ -264,22 +269,42 @@
<translation>例 @joe:matrix.org</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>パスワード</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation>デバイス名</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>ログイン</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation>自動検出できませんでした。不正な形式の応答を受信しました。</translation>
</message>
@@ -289,7 +314,7 @@
<translation>自動検出できませんでした。.well-known要求時の不明なエラー。</translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation>必要な端点が見つかりません。Matrixサーバーではないかもしれません。</translation>
</message>
@@ -304,10 +329,20 @@
<translation>不明なエラーが発生しました。ホームサーバーのドメイン名が有効であるかを確認して下さい。</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>パスワードが入力されていません</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +360,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation>編集済み</translation>
</message>
@@ -385,21 +420,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>パスワード</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>パスワード確認</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translation>ホームサーバー</translation>
+ <source>Homeserver</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>登録</translation>
</message>
@@ -548,7 +598,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation>-- 復号エラー (データベースと通信できませんでした) --</translation>
@@ -597,12 +647,7 @@
<translation type="unfinished">-- 暗号化イベント (復号鍵が見つかりません) --</translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished">-- 暗号化イベント (不明なイベント型です) --</translation>
@@ -721,7 +766,12 @@
<translation>%1がノックを編集しました。</translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation>%1からのノックを拒否しました。</translation>
</message>
@@ -745,7 +795,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -808,7 +858,7 @@
<translation>部屋が開いていません</translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation>閉じる</translation>
</message>
diff --git a/resources/langs/nheko_nl.ts b/resources/langs/nheko_nl.ts
index dc19fd4e..8f5a9f21 100644
--- a/resources/langs/nheko_nl.ts
+++ b/resources/langs/nheko_nl.ts
@@ -5,7 +5,7 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
+ <source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
@@ -58,7 +68,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -68,12 +78,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -124,12 +129,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation type="unfinished"></translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation>Matrix-id</translation>
</message>
@@ -264,22 +269,42 @@
<translation>b.v @jan:matrix.org<</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>Wachtwoord</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>INLOGGEN</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -289,7 +314,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation type="unfinished"></translation>
</message>
@@ -304,10 +329,20 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>Leeg wachtwoord</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +360,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -385,21 +420,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>Wachtwoord</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>Wachtwoord bevestigen</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translation>Thuisserver</translation>
+ <source>Homeserver</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>REGISTREREN</translation>
</message>
@@ -548,7 +598,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -597,12 +647,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -722,7 +767,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -746,7 +796,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -809,7 +859,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_pl.ts b/resources/langs/nheko_pl.ts
index a2d7ca11..7e4495fa 100644
--- a/resources/langs/nheko_pl.ts
+++ b/resources/langs/nheko_pl.ts
@@ -5,7 +5,7 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
+ <source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
@@ -58,7 +68,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -68,12 +78,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation>Spróbuj zalogować się ponownie: %1</translation>
</message>
@@ -124,12 +129,7 @@
<translation>Tworzenie pokoju nie powiodło się: %1</translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation>Nie udało się opuścić pokoju: %1</translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation>ID Matrixa</translation>
</message>
@@ -264,22 +269,42 @@
<translation>np. @joe:matrix.org</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>Hasło</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation>Nazwa urządzenia</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>ZALOGUJ</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -289,7 +314,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation>Nie odnaleziono wymaganych punktów końcowych. To może nie być serwer Matriksa.</translation>
</message>
@@ -304,10 +329,20 @@
<translation>Wystąpił nieznany błąd. Upewnij się, że domena serwera domowego jest prawidłowa.</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>Puste hasło</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +360,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -385,21 +420,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>Hasło</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>Potwierdzenie hasła</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translation>Serwer domowy</translation>
+ <source>Homeserver</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>ZAREJESTRUJ</translation>
</message>
@@ -548,7 +598,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -597,12 +647,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -723,7 +768,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -747,7 +797,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -810,7 +860,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
diff --git a/resources/langs/nheko_ru.ts b/resources/langs/nheko_ru.ts
index 178301a3..99a31673 100644
--- a/resources/langs/nheko_ru.ts
+++ b/resources/langs/nheko_ru.ts
@@ -5,7 +5,7 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
+ <source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
@@ -58,7 +68,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -68,12 +78,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation>Повторите попытку входа: %1</translation>
</message>
@@ -124,12 +129,7 @@
<translation>Не удалось создать комнату: %1</translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation>Не удалось покинуть комнату: %1</translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation>Идентификатор Matrix</translation>
</message>
@@ -264,22 +269,42 @@
<translation>Пример: @joe:matrix.org</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation>Имя устройства</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>ВОЙТИ</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -289,7 +314,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation>Необходимые конечные точки не найдены. Возможно, это не сервер Matrix.</translation>
</message>
@@ -304,10 +329,20 @@
<translation>Произошла неизвестная ошибка. Убедитесь, что домен homeserver действителен.</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>Пустой пароль</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +360,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -385,21 +420,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>Подтверждение пароля</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translation>Домашний сервер</translation>
+ <source>Homeserver</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>РЕГИСТРАЦИЯ</translation>
</message>
@@ -548,7 +598,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -597,12 +647,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -723,7 +768,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -747,7 +797,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -810,7 +860,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished">Закрыть</translation>
</message>
diff --git a/resources/langs/nheko_zh_CN.ts b/resources/langs/nheko_zh_CN.ts
index b0f6728d..8afd6e3b 100644
--- a/resources/langs/nheko_zh_CN.ts
+++ b/resources/langs/nheko_zh_CN.ts
@@ -5,7 +5,7 @@
<name>Cache</name>
<message>
<location filename="../../src/Cache.cpp" line="+1341"/>
- <source>You joined this room</source>
+ <source>You joined this room.</source>
<translation type="unfinished"></translation>
</message>
</context>
@@ -18,12 +18,22 @@
</message>
<message>
<location line="+4"/>
- <location line="+894"/>
+ <location line="+898"/>
<source>Invited user: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-5"/>
+ <location line="-463"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+428"/>
+ <source>Room %1 created.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+30"/>
<source>Failed to invite %1 to %2: %3</source>
<translation type="unfinished"></translation>
</message>
@@ -58,7 +68,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-819"/>
+ <location line="-823"/>
<source>Failed to upload media. Please try again.</source>
<translation type="unfinished"></translation>
</message>
@@ -68,12 +78,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+1"/>
- <source>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</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+12"/>
+ <location line="+13"/>
<source>Incompatible cache version</source>
<translation type="unfinished"></translation>
</message>
@@ -99,7 +104,7 @@
</message>
<message>
<location line="+51"/>
- <location line="+215"/>
+ <location line="+219"/>
<source>Please try to login again: %1</source>
<translation>请尝试再次登录：%1</translation>
</message>
@@ -124,12 +129,7 @@
<translation>创建聊天室失败：%1</translation>
</message>
<message>
- <location line="+5"/>
- <source>Room %1 created</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+11"/>
+ <location line="+16"/>
<source>Failed to leave room: %1</source>
<translation>离开聊天室失败：%1</translation>
</message>
@@ -238,10 +238,15 @@
<context>
<name>EncryptionIndicator</name>
<message>
- <location filename="../qml/EncryptionIndicator.qml" line="+12"/>
+ <location filename="../qml/EncryptionIndicator.qml" line="+36"/>
<source>Encrypted</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location line="+2"/>
+ <source>This message is not encrypted!</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>InviteeItem</name>
@@ -254,7 +259,7 @@
<context>
<name>LoginPage</name>
<message>
- <location filename="../../src/LoginPage.cpp" line="+82"/>
+ <location filename="../../src/LoginPage.cpp" line="+89"/>
<source>Matrix ID</source>
<translation></translation>
</message>
@@ -264,22 +269,42 @@
<translation>例如 @joe:matrix.org</translation>
</message>
<message>
- <location line="+15"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+21"/>
<source>Password</source>
<translation>密码</translation>
</message>
<message>
- <location line="+4"/>
+ <location line="+5"/>
<source>Device name</source>
<translation>设备名</translation>
</message>
<message>
- <location line="+19"/>
+ <location line="+2"/>
+ <source>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.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+6"/>
+ <source>The address that can be used to contact you homeservers client API.
+Example: https://server.my:8787</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+16"/>
+ <location line="+185"/>
<source>LOGIN</source>
<translation>登录</translation>
</message>
<message>
- <location line="+85"/>
+ <location line="-100"/>
<source>Autodiscovery failed. Received malformed response.</source>
<translation type="unfinished"></translation>
</message>
@@ -289,7 +314,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+24"/>
+ <location line="+25"/>
<source>The required endpoints were not found. Possibly not a Matrix server.</source>
<translation>没找到要求的终端。可能不是一个 Matrix 服务器。</translation>
</message>
@@ -304,10 +329,20 @@
<translation>发生了一个未知错误。请确认服务器域名合法。</translation>
</message>
<message>
- <location line="+60"/>
+ <location line="+55"/>
+ <source>SSO LOGIN</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+25"/>
<source>Empty password</source>
<translation>空密码</translation>
</message>
+ <message>
+ <location line="+52"/>
+ <source>SSO login failed</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MemberList</name>
@@ -325,7 +360,7 @@
<context>
<name>MessageDelegate</name>
<message>
- <location filename="../qml/delegates/MessageDelegate.qml" line="+64"/>
+ <location filename="../qml/delegates/MessageDelegate.qml" line="+66"/>
<source>redacted</source>
<translation type="unfinished"></translation>
</message>
@@ -385,21 +420,36 @@
</message>
<message>
<location line="+3"/>
+ <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+4"/>
<source>Password</source>
<translation>密码</translation>
</message>
<message>
+ <location line="+2"/>
+ <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location line="+4"/>
<source>Password confirmation</source>
<translation>密码确认</translation>
</message>
<message>
<location line="+4"/>
- <source>Home Server</source>
- <translation>服务器</translation>
+ <source>Homeserver</source>
+ <translation type="unfinished"></translation>
</message>
<message>
- <location line="+16"/>
+ <location line="+2"/>
+ <source>A server that allows registration. Since matrix is decentralized, you need to first find a server you can register on or host your own.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+17"/>
<source>REGISTER</source>
<translation>注册</translation>
</message>
@@ -548,7 +598,7 @@
<context>
<name>TimelineModel</name>
<message>
- <location filename="../../src/timeline/TimelineModel.cpp" line="+844"/>
+ <location filename="../../src/timeline/TimelineModel.cpp" line="+853"/>
<source>-- Decryption Error (failed to communicate with DB) --</source>
<comment>Placeholder, when the message can't be decrypted, because the DB access failed when trying to lookup the session.</comment>
<translation type="unfinished"></translation>
@@ -597,12 +647,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="-258"/>
- <source>You joined this room</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location line="+340"/>
+ <location line="+82"/>
<source>-- Encrypted Event (Unknown event type) --</source>
<comment>Placeholder, when the message was decrypted, but we couldn't parse it, because Nheko/mtxclient don't support that event type yet.</comment>
<translation type="unfinished"></translation>
@@ -721,7 +766,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+2"/>
+ <location line="-1278"/>
+ <source>You joined this room.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location line="+1280"/>
<source>Rejected the knock from %1.</source>
<translation type="unfinished"></translation>
</message>
@@ -745,7 +795,7 @@
<context>
<name>TimelineRow</name>
<message>
- <location filename="../qml/TimelineRow.qml" line="+83"/>
+ <location filename="../qml/TimelineRow.qml" line="+84"/>
<source>React</source>
<translation type="unfinished"></translation>
</message>
@@ -808,7 +858,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location line="+254"/>
+ <location line="+256"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
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/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;
}
diff --git a/resources/qml/TimelineRow.qml b/resources/qml/TimelineRow.qml
index 214f2002..9fc98419 100644
--- a/resources/qml/TimelineRow.qml
+++ b/resources/qml/TimelineRow.qml
@@ -67,7 +67,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/qml/TimelineView.qml b/resources/qml/TimelineView.qml
index edb25441..ea5e6d60 100644
--- a/resources/qml/TimelineView.qml
+++ b/resources/qml/TimelineView.qml
@@ -125,6 +125,8 @@ Page {
visible: timelineManager.timeline != null
+ cacheBuffer: 500
+
anchors.left: parent.left
anchors.right: parent.right
anchors.top: parent.top
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: "<style type=\"text/css\">a { color:"+colors.link+";}</style>" + formatted.replace("<pre>", "<pre style='white-space: pre-wrap'>")
width: parent ? parent.width : undefined
+ height: isReply ? Math.min(chat.height / 8, implicitHeight) : undefined
+ clip: true
}
diff --git a/resources/res.qrc b/resources/res.qrc
index 008ff551..439ed97b 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -14,6 +14,8 @@
<file>icons/ui/double-tick-indicator@2x.png</file>
<file>icons/ui/lock.png</file>
<file>icons/ui/lock@2x.png</file>
+ <file>icons/ui/unlock.png</file>
+ <file>icons/ui/unlock@2x.png</file>
<file>icons/ui/clock.png</file>
<file>icons/ui/clock@2x.png</file>
<file>icons/ui/checkmark.png</file>
|
