Improve Register page (#346)

* add username error label, add word wrapping for error labels

* make lint

* last commits

* remove font, and remove some lambdas

* add QRegularExpression for regex

* improve review things

* add isModified() for checkFields()

* add check isModified() for  all fields in checkFields

* Update src/RegisterPage.cpp

Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>

* remove emit call for showError

Co-authored-by: DeepBlueV7.X <nicolas.werner@hotmail.de>
This commit is contained in:
Kirillpt 2020-12-01 01:30:33 +03:00 committed by GitHub
parent 95667edb14
commit 68b2f6cb4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 648 additions and 523 deletions

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2059,7 +2060,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2069,7 +2070,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2081,7 +2082,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -2090,7 +2091,7 @@ Media size: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation>Eingeladener Benutzer: %1</translation> <translation>Eingeladener Benutzer: %1</translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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>Das Migrieren des Caches auf die aktuelle Version ist fehlgeschlagen. Das kann verschiedene Gründe als Ursache haben. Bitte melde den Fehler und verwende in der Zwischenzeit eine ältere Version. Alternativ kannst du das Cache manuell löschen.</translation> <translation>Das Migrieren des Caches auf die aktuelle Version ist fehlgeschlagen. Das kann verschiedene Gründe als Ursache haben. Bitte melde den Fehler und verwende in der Zwischenzeit eine ältere Version. Alternativ kannst du das Cache manuell löschen.</translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation>Raum %1 erzeugt.</translation> <translation>Raum %1 erzeugt.</translation>
</message> </message>
@ -139,7 +139,7 @@
<translation>Verbannung von %1 wurde aufgehoben.</translation> <translation>Verbannung von %1 wurde aufgehoben.</translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation>Cache migration fehlgeschlagen!</translation> <translation>Cache migration fehlgeschlagen!</translation>
</message> </message>
@ -164,7 +164,7 @@
<translation>Gespeicherte Nachrichten konnten nicht wiederhergestellt werden. Bitte melde Dich erneut an.</translation> <translation>Gespeicherte Nachrichten konnten nicht wiederhergestellt werden. Bitte melde Dich erneut an.</translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation>Fehler beim Setup der Verschlüsselungsschlüssel. Servermeldung: %1 %2. Bitte versuche es später erneut.</translation> <translation>Fehler beim Setup der Verschlüsselungsschlüssel. Servermeldung: %1 %2. Bitte versuche es später erneut.</translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation>Anwenden</translation> <translation>Anwenden</translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>Matrix-ID</translation> <translation>Matrix-ID</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>z.B. @joe:matrix.org</translation> <translation>z.B. @joe:matrix.org</translation>
</message> </message>
@ -512,7 +512,7 @@ Beispiel: https://mein.server:8787</translation>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>ANMELDEN</translation> <translation>ANMELDEN</translation>
</message> </message>
@ -547,12 +547,12 @@ Beispiel: https://mein.server:8787</translation>
<translation>SSO ANMELDUNG</translation> <translation>SSO ANMELDUNG</translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Leeres Passwort</translation> <translation>Leeres Passwort</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation>SSO Anmeldung fehlgeschlagen</translation> <translation>SSO Anmeldung fehlgeschlagen</translation>
</message> </message>
@ -752,22 +752,23 @@ Beispiel: https://mein.server:8787</translation>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Benutzername</translation> <translation>Benutzername</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <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> <translation>Der Benutzername sollte nicht leer sein und nur aus a-z, 0-9, ., _, =, - und / bestehen.</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Passwort</translation> <translation>Passwort</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <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> <translation>Bitte wähle ein sicheres Passwort. Die genauen Anforderungen bestimmt dein Server.</translation>
</message> </message>
@ -787,32 +788,32 @@ Beispiel: https://mein.server:8787</translation>
<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> <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>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>REGISTRIEREN</translation> <translation>REGISTRIEREN</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation>Keine unterstützten Registrierungsmethoden!</translation> <translation>Keine unterstützten Registrierungsmethoden!</translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Ungültiger Benutzername</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>Passwort nicht lang genug (mind. 8 Zeichen)</translation> <translation>Passwort nicht lang genug (mind. 8 Zeichen)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>Passwörter stimmen nicht überein</translation> <translation>Passwörter stimmen nicht überein</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Ungültiger Servername</translation> <translation>Ungültiger Servername</translation>
</message> </message>
@ -2064,7 +2065,7 @@ Medien-Größe: %2
<translation>Verschlüsselung</translation> <translation>Verschlüsselung</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation>Ende-zu-Ende Verschlüsselung</translation> <translation>Ende-zu-Ende Verschlüsselung</translation>
</message> </message>
@ -2074,7 +2075,7 @@ Medien-Größe: %2
<translation>Verschlüsselung befindet sich momentan in einem experimentellen Stadium, unerwartete Fehler können auftreten. &lt;br&gt;Sie kann anschließend nicht wieder deaktiviert werden.</translation> <translation>Verschlüsselung befindet sich momentan in einem experimentellen Stadium, unerwartete Fehler können auftreten. &lt;br&gt;Sie kann anschließend nicht wieder deaktiviert werden.</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation>Schlüsselnfrage beantworten</translation> <translation>Schlüsselnfrage beantworten</translation>
</message> </message>
@ -2086,7 +2087,7 @@ Medien-Größe: %2
<translation>Ob nheko automatisch auf Anfragen mit Sessionschlüsseln antworten soll, oder nicht. Bitte mit Vorsicht nutzen, da dies eine temporäre Massnahme ist. Sie dient dem Test von E2E Verschlüsselung, bis die Geräteverifikation fertig gestellt ist.</translation> <translation>Ob nheko automatisch auf Anfragen mit Sessionschlüsseln antworten soll, oder nicht. Bitte mit Vorsicht nutzen, da dies eine temporäre Massnahme ist. Sie dient dem Test von E2E Verschlüsselung, bis die Geräteverifikation fertig gestellt ist.</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n Teilnehmer</numerusform> <numerusform>%n Teilnehmer</numerusform>
@ -2094,7 +2095,7 @@ Medien-Größe: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>Aktivierung der Verschlüsselung fehlgeschlagen: %1</translation> <translation>Aktivierung der Verschlüsselung fehlgeschlagen: %1</translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>Matrix ID</translation> <translation>Matrix ID</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>π.χ @john:matrix.org</translation> <translation>π.χ @john:matrix.org</translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>ΕΙΣΟΔΟΣ</translation> <translation>ΕΙΣΟΔΟΣ</translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Κενός κωδικός</translation> <translation>Κενός κωδικός</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Όνομα χρήστη</translation> <translation>Όνομα χρήστη</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Κωδικός</translation> <translation>Κωδικός</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>ΕΓΓΡΑΦΗ</translation> <translation>ΕΓΓΡΑΦΗ</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Μη έγκυρο όνομα χρήστη</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>Ο κωδικός δεν αποτελείται από αρκετους χαρακτήρες</translation> <translation>Ο κωδικός δεν αποτελείται από αρκετους χαρακτήρες</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>Οι κωδικοί δεν ταιριίαζουν</translation> <translation>Οι κωδικοί δεν ταιριίαζουν</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Λανθασμένο όνομα διακομιστή</translation> <translation>Λανθασμένο όνομα διακομιστή</translation>
</message> </message>
@ -2058,7 +2059,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2068,7 +2069,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2080,7 +2081,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -2088,7 +2089,7 @@ Media size: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation>Invited user: %1</translation> <translation>Invited user: %1</translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <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>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation>Room %1 created.</translation> <translation>Room %1 created.</translation>
</message> </message>
@ -139,7 +139,7 @@
<translation>Unbanned user: %1</translation> <translation>Unbanned user: %1</translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation>Cache migration failed!</translation> <translation>Cache migration failed!</translation>
</message> </message>
@ -164,7 +164,7 @@
<translation>Failed to restore save data. Please login again.</translation> <translation>Failed to restore save data. Please login again.</translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</translation> <translation>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation>Apply</translation> <translation>Apply</translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>Matrix ID</translation> <translation>Matrix ID</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>e.g @joe:matrix.org</translation> <translation>e.g @joe:matrix.org</translation>
</message> </message>
@ -512,7 +512,7 @@ Example: https://server.my:8787</translation>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>LOGIN</translation> <translation>LOGIN</translation>
</message> </message>
@ -547,12 +547,12 @@ Example: https://server.my:8787</translation>
<translation>SSO LOGIN</translation> <translation>SSO LOGIN</translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Empty password</translation> <translation>Empty password</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation>SSO login failed</translation> <translation>SSO login failed</translation>
</message> </message>
@ -752,22 +752,23 @@ Example: https://server.my:8787</translation>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Username</translation> <translation>Username</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <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> <translation>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Password</translation> <translation>Password</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <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> <translation>Please choose a secure password. The exact requirements for password strength may depend on your server.</translation>
</message> </message>
@ -787,32 +788,32 @@ Example: https://server.my:8787</translation>
<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> <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>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>REGISTER</translation> <translation>REGISTER</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation>No supported registration flows!</translation> <translation>No supported registration flows!</translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Invalid username</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>Password is not long enough (min 8 chars)</translation> <translation>Password is not long enough (min 8 chars)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>Passwords don&apos;t match</translation> <translation>Passwords don&apos;t match</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Invalid server name</translation> <translation>Invalid server name</translation>
</message> </message>
@ -2072,7 +2073,7 @@ Media size: %2
<translation>Encryption</translation> <translation>Encryption</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation>End-to-End Encryption</translation> <translation>End-to-End Encryption</translation>
</message> </message>
@ -2082,7 +2083,7 @@ Media size: %2
<translation>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</translation> <translation>Encryption is currently experimental and things might break unexpectedly. &lt;br&gt;Please take note that it can&apos;t be disabled afterwards.</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation>Respond to key requests</translation> <translation>Respond to key requests</translation>
</message> </message>
@ -2096,7 +2097,7 @@ Media size: %2
E2E implementation until device verification is completed.</translation> E2E implementation until device verification is completed.</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n member</numerusform> <numerusform>%n member</numerusform>
@ -2104,7 +2105,7 @@ Media size: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>Failed to enable encryption: %1</translation> <translation>Failed to enable encryption: %1</translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translatorcomment>I believe that the -at ending is correct here.</translatorcomment> <translatorcomment>I believe that the -at ending is correct here.</translatorcomment>
<translation>Ĉambro %1 farit.</translation> <translation>Ĉambro %1 farit.</translation>
@ -140,7 +140,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -165,7 +165,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -262,7 +262,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -474,7 +474,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -512,7 +512,7 @@ Ekzemplo: https://servisto.mia:8787</translation>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translatorcomment>Maybe shouldn&apos;t be imperative?</translatorcomment> <translatorcomment>Maybe shouldn&apos;t be imperative?</translatorcomment>
<translation>ENSALUTU</translation> <translation>ENSALUTU</translation>
@ -548,12 +548,12 @@ Ekzemplo: https://servisto.mia:8787</translation>
<translation>SSO ENSALUTU</translation> <translation>SSO ENSALUTU</translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -753,22 +753,23 @@ Ekzemplo: https://servisto.mia:8787</translation>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Uzantnomo</translation> <translation>Uzantnomo</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -788,32 +789,32 @@ Ekzemplo: https://servisto.mia:8787</translation>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation type="unfinished">REGISTRU</translation> <translation type="unfinished">REGISTRU</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2069,7 +2070,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2079,7 +2080,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2091,7 +2092,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -2099,7 +2100,7 @@ Media size: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation>Kutsutud kasutaja: %1</translation> <translation>Kutsutud kasutaja: %1</translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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>Puhverdatud andmete muutmine sobivaks rakenduse praeguse versiooniga ei õnnestunud. Sellel võib olla erinevaid põhjuseid. Palun saada meile veateade ja seni kasuta vanemat rakenduse versiooni. Aga kui sa soovid proovida, siis kustuta puhverdatud andmed käsitsi.</translation> <translation>Puhverdatud andmete muutmine sobivaks rakenduse praeguse versiooniga ei õnnestunud. Sellel võib olla erinevaid põhjuseid. Palun saada meile veateade ja seni kasuta vanemat rakenduse versiooni. Aga kui sa soovid proovida, siis kustuta puhverdatud andmed käsitsi.</translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation>%1 jututuba on loodud.</translation> <translation>%1 jututuba on loodud.</translation>
</message> </message>
@ -139,7 +139,7 @@
<translation>Suhtluskeeld eemaldatud: %1</translation> <translation>Suhtluskeeld eemaldatud: %1</translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation>Puhvri versiooniuuendus ebaõnnestus!</translation> <translation>Puhvri versiooniuuendus ebaõnnestus!</translation>
</message> </message>
@ -164,7 +164,7 @@
<translation>Salvestatud andmete taastamine ei õnnestunud. Palun logi uuesti sisse.</translation> <translation>Salvestatud andmete taastamine ei õnnestunud. Palun logi uuesti sisse.</translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation>Krüptovõtmete kasutusele võtmine ei õnnestunud. Koduserveri vastus päringule: %1 %2. Palun proovi hiljem uuesti.</translation> <translation>Krüptovõtmete kasutusele võtmine ei õnnestunud. Koduserveri vastus päringule: %1 %2. Palun proovi hiljem uuesti.</translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation>Rakenda</translation> <translation>Rakenda</translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>Matrix&apos;i kasutajatunnus</translation> <translation>Matrix&apos;i kasutajatunnus</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>näiteks @kadri:matrix.org</translation> <translation>näiteks @kadri:matrix.org</translation>
</message> </message>
@ -512,7 +512,7 @@ Näiteks: https://server.minu:8787</translation>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>LOGI SISSE</translation> <translation>LOGI SISSE</translation>
</message> </message>
@ -547,12 +547,12 @@ Näiteks: https://server.minu:8787</translation>
<translation>ÜHEKORDNE SISSELOGIMINE</translation> <translation>ÜHEKORDNE SISSELOGIMINE</translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Tühi salasõna</translation> <translation>Tühi salasõna</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation>Ühekordne sisselogimine ei õnnestunud</translation> <translation>Ühekordne sisselogimine ei õnnestunud</translation>
</message> </message>
@ -752,22 +752,23 @@ Näiteks: https://server.minu:8787</translation>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Kasutajanimi</translation> <translation>Kasutajanimi</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation>Kasutajanimi ei tohi olla tühi ning võib sisaldada vaid a-z, 0-9, ., _, =, -, / tähemärke.</translation> <translation>Kasutajanimi ei tohi olla tühi ning võib sisaldada vaid a-z, 0-9, ., _, =, -, / tähemärke.</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Salasõna</translation> <translation>Salasõna</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation>Palun vali tutvaline salasõna. Täpsemad nõuded salasõnale sõltuvad sinu koduserveri seadistustest.</translation> <translation>Palun vali tutvaline salasõna. Täpsemad nõuded salasõnale sõltuvad sinu koduserveri seadistustest.</translation>
</message> </message>
@ -787,32 +788,32 @@ Näiteks: https://server.minu:8787</translation>
<translation>See on server, kus sa oma kasutajakonto registreerid. Kuna Matrix on hajutatud suhtlusvõrk, siis esmalt pead leidma sulle sobiliku koduserveri või panema püsti täitsa oma enda koduserveri.</translation> <translation>See on server, kus sa oma kasutajakonto registreerid. Kuna Matrix on hajutatud suhtlusvõrk, siis esmalt pead leidma sulle sobiliku koduserveri või panema püsti täitsa oma enda koduserveri.</translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>REGISTREERI</translation> <translation>REGISTREERI</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation>Selline registreerimise töövoog pole toetatud!</translation> <translation>Selline registreerimise töövoog pole toetatud!</translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Vigane kasutajanimi</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>Salasõna pole piisavalt pikk (vähemalt 8 tähemärki)</translation> <translation>Salasõna pole piisavalt pikk (vähemalt 8 tähemärki)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>Salasõnad ei klapi omavahel</translation> <translation>Salasõnad ei klapi omavahel</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Vigane koduserveri nimi</translation> <translation>Vigane koduserveri nimi</translation>
</message> </message>
@ -2072,7 +2073,7 @@ Meedia suurus: %2
<translation>Krüptimine</translation> <translation>Krüptimine</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation>Läbiv krüptimine</translation> <translation>Läbiv krüptimine</translation>
</message> </message>
@ -2082,7 +2083,7 @@ Meedia suurus: %2
<translation>Krüptimine on nhekos hetkel veel katseline ning nii mõndagi võib ootamatult katki minna. &lt;br&gt;Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation> <translation>Krüptimine on nhekos hetkel veel katseline ning nii mõndagi võib ootamatult katki minna. &lt;br&gt;Palun arvesta, et krüptimist ei saa hiljem enam välja lülitada.</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation>Vasta krüptovõtmete päringutele</translation> <translation>Vasta krüptovõtmete päringutele</translation>
</message> </message>
@ -2096,7 +2097,7 @@ Meedia suurus: %2
testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.</translation> testimiseks seni, kuni terviklik seadmete verifitseerimine on implementeeritud.</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n kasutaja</numerusform> <numerusform>%n kasutaja</numerusform>
@ -2104,7 +2105,7 @@ Meedia suurus: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>Krüptimise kasutuselevõtmine ei õnnestunud: %1</translation> <translation>Krüptimise kasutuselevõtmine ei õnnestunud: %1</translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation>Tallennettujen tietojen palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen.</translation> <translation>Tallennettujen tietojen palauttaminen epäonnistui. Ole hyvä ja kirjaudu sisään uudelleen.</translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation>Salausavainten lähetys epäonnistui. Palvelimen vastaus: %1 %2. Ole hyvä ja yritä uudelleen myöhemmin.</translation> <translation>Salausavainten lähetys epäonnistui. Palvelimen vastaus: %1 %2. Ole hyvä ja yritä uudelleen myöhemmin.</translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation>Tallenna</translation> <translation>Tallenna</translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>Matrix-tunnus</translation> <translation>Matrix-tunnus</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>esim. @joe:matrix.org</translation> <translation>esim. @joe:matrix.org</translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>KIRJAUDU</translation> <translation>KIRJAUDU</translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Tyhjä salasana</translation> <translation>Tyhjä salasana</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Käyttäjänimi</translation> <translation>Käyttäjänimi</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Salasana</translation> <translation>Salasana</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>REKISTERÖIDY</translation> <translation>REKISTERÖIDY</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Epäkelpo käyttäjänimi</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>Salasana ei ole tarpeeksi pitkä (vähintään 8 merkkiä)</translation> <translation>Salasana ei ole tarpeeksi pitkä (vähintään 8 merkkiä)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>Salasanat eivät täsmää</translation> <translation>Salasanat eivät täsmää</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Epäkelpo palvelimen nimi</translation> <translation>Epäkelpo palvelimen nimi</translation>
</message> </message>
@ -2060,7 +2061,7 @@ Median koko: %2
<translation>Salaus</translation> <translation>Salaus</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation>Päästä-päähän-salaus</translation> <translation>Päästä-päähän-salaus</translation>
</message> </message>
@ -2070,7 +2071,7 @@ Median koko: %2
<translation>Salaus on tällä hetkellä kokeellinen ja asiat saattavat mennä rikki odottamattomasti.&lt;br&gt;Huomaa, ettei sitä voi poistaa käytöstä jälkikäteen.</translation> <translation>Salaus on tällä hetkellä kokeellinen ja asiat saattavat mennä rikki odottamattomasti.&lt;br&gt;Huomaa, ettei sitä voi poistaa käytöstä jälkikäteen.</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation>Vastaa avainpyyntöihin</translation> <translation>Vastaa avainpyyntöihin</translation>
</message> </message>
@ -2084,7 +2085,7 @@ Median koko: %2
kunnes laitteiden vahvistus on valmis.</translation> kunnes laitteiden vahvistus on valmis.</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n käyttäjä</numerusform> <numerusform>%n käyttäjä</numerusform>
@ -2092,7 +2093,7 @@ Median koko: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>Salauksen aktivointi epäonnistui: %1</translation> <translation>Salauksen aktivointi epäonnistui: %1</translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation>%1 a é invité(e)</translation> <translation>%1 a é invité(e)</translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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>La migration du cache vers la version actuelle a échoué. Cela peut arriver pour différentes raisons. Signalez le problème et essayez d&apos;utiliser une ancienne version en attendant. Vous pouvez également supprimer le cache manuellement.</translation> <translation>La migration du cache vers la version actuelle a échoué. Cela peut arriver pour différentes raisons. Signalez le problème et essayez d&apos;utiliser une ancienne version en attendant. Vous pouvez également supprimer le cache manuellement.</translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation>Salon %1 créé.</translation> <translation>Salon %1 créé.</translation>
</message> </message>
@ -139,7 +139,7 @@
<translation>%1 n&apos;est plus banni(e)</translation> <translation>%1 n&apos;est plus banni(e)</translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation>Échec de la migration du cache&#x202f;!</translation> <translation>Échec de la migration du cache&#x202f;!</translation>
</message> </message>
@ -164,7 +164,7 @@
<translation>Échec de la restauration des données sauvegardées. Veuillez vous reconnecter.</translation> <translation>Échec de la restauration des données sauvegardées. Veuillez vous reconnecter.</translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation>Échec de la configuration des clés de chiffrement. Réponse du serveur&#xa0;: %1 %2. Veuillez réessayer plus tard.</translation> <translation>Échec de la configuration des clés de chiffrement. Réponse du serveur&#xa0;: %1 %2. Veuillez réessayer plus tard.</translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation>Appliquer</translation> <translation>Appliquer</translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>Identifiant Matrix</translation> <translation>Identifiant Matrix</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>ex : @joe:matrix.org</translation> <translation>ex : @joe:matrix.org</translation>
</message> </message>
@ -512,7 +512,7 @@ Exemple&#xa0;: https&#x202f;://monserveur.example.com&#x202f;:8787</translation>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>CONNEXION</translation> <translation>CONNEXION</translation>
</message> </message>
@ -547,12 +547,12 @@ Exemple&#xa0;: https&#x202f;://monserveur.example.com&#x202f;:8787</translation>
<translation>CONNEXION SSO</translation> <translation>CONNEXION SSO</translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Mot de passe vide</translation> <translation>Mot de passe vide</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation>Échec de la connexion SSO</translation> <translation>Échec de la connexion SSO</translation>
</message> </message>
@ -752,22 +752,23 @@ Exemple&#xa0;: https&#x202f;://monserveur.example.com&#x202f;:8787</translation>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Nom d&apos;utilisateur</translation> <translation>Nom d&apos;utilisateur</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation>Le nom d&apos;utilisateur ne doit pas être vide, et ne peut contenir que les caractères a à z, 0 à 9, et «&#x202f;. _ = - /&#x202f;».</translation> <translation>Le nom d&apos;utilisateur ne doit pas être vide, et ne peut contenir que les caractères a à z, 0 à 9, et «&#x202f;. _ = - /&#x202f;».</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Mot de passe</translation> <translation>Mot de passe</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation>Veuillez choisir un mot de passe fort. Les demandes exactes sur la robustesse du mot de passe peuvent dépendre de votre serveur.</translation> <translation>Veuillez choisir un mot de passe fort. Les demandes exactes sur la robustesse du mot de passe peuvent dépendre de votre serveur.</translation>
</message> </message>
@ -787,32 +788,32 @@ Exemple&#xa0;: https&#x202f;://monserveur.example.com&#x202f;:8787</translation>
<translation>Un serveur qui autorise les créations de compte. Matrix étant décentralisé, vous devez tout d&apos;abord trouver un serveur sur lequel vous pouvez vous inscrire, ou bien héberger le vôtre.</translation> <translation>Un serveur qui autorise les créations de compte. Matrix étant décentralisé, vous devez tout d&apos;abord trouver un serveur sur lequel vous pouvez vous inscrire, ou bien héberger le vôtre.</translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>S&apos;ENREGISTRER</translation> <translation>S&apos;ENREGISTRER</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation>Pas de méthode d&apos;inscription supportée&#xa0;!</translation> <translation>Pas de méthode d&apos;inscription supportée&#xa0;!</translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Nom d&apos;utilisateur invalide</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>Le mot de passe n&apos;est pas assez long (8 caractères minimum)</translation> <translation>Le mot de passe n&apos;est pas assez long (8 caractères minimum)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>Les mots de passe ne sont pas identiques</translation> <translation>Les mots de passe ne sont pas identiques</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Le nom du serveur est invalide</translation> <translation>Le nom du serveur est invalide</translation>
</message> </message>
@ -2073,7 +2074,7 @@ Taille du média : %2
<translation>Chiffrement</translation> <translation>Chiffrement</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation>Chiffrement bout-à-bout</translation> <translation>Chiffrement bout-à-bout</translation>
</message> </message>
@ -2084,7 +2085,7 @@ Taille du média : %2
Veuillez noter qu&apos;il n&apos;est pas possible de le désactiver ultérieurement.</translation> Veuillez noter qu&apos;il n&apos;est pas possible de le désactiver ultérieurement.</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation>Répondre aux requêtes de clés</translation> <translation>Répondre aux requêtes de clés</translation>
</message> </message>
@ -2099,7 +2100,7 @@ temporaire pour valider l&apos;implémentation du chiffrement de bout en bout en
attendant que la vérification des appareils soit opérationnelle.</translation> attendant que la vérification des appareils soit opérationnelle.</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n membre</numerusform> <numerusform>%n membre</numerusform>
@ -2107,7 +2108,7 @@ attendant que la vérification des appareils soit opérationnelle.</translation>
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>Échec de l&apos;activation du chiffrement&#xa0;&#xa0;: %1</translation> <translation>Échec de l&apos;activation du chiffrement&#xa0;&#xa0;: %1</translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation>Invitato utente: %1</translation> <translation>Invitato utente: %1</translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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>Migrazione della cache alla versione corrente fallita. Questo può avere diverse cause. Per favore apri una issue e nel frattempo prova ad usare una versione più vecchia. In alternativa puoi provare a cancellare la cache manualmente.</translation> <translation>Migrazione della cache alla versione corrente fallita. Questo può avere diverse cause. Per favore apri una issue e nel frattempo prova ad usare una versione più vecchia. In alternativa puoi provare a cancellare la cache manualmente.</translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation>Stanza %1 creata.</translation> <translation>Stanza %1 creata.</translation>
</message> </message>
@ -139,7 +139,7 @@
<translation>Rimosso il ban dall&apos;utente: %1</translation> <translation>Rimosso il ban dall&apos;utente: %1</translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation>Migrazione della cache fallita!</translation> <translation>Migrazione della cache fallita!</translation>
</message> </message>
@ -164,7 +164,7 @@
<translation>Impossibile ripristinare i dati salvati. Per favore accedi nuovamente.</translation> <translation>Impossibile ripristinare i dati salvati. Per favore accedi nuovamente.</translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation>Impossibile configurare le chiavi crittografiche. Risposta del server: %1 %2. Per favore riprova in seguito.</translation> <translation>Impossibile configurare le chiavi crittografiche. Risposta del server: %1 %2. Per favore riprova in seguito.</translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation>Applica</translation> <translation>Applica</translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>ID Matrix</translation> <translation>ID Matrix</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>es. @joe:matrix.org</translation> <translation>es. @joe:matrix.org</translation>
</message> </message>
@ -512,7 +512,7 @@ Esempio: https://server.mio:8787</translation>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>ACCEDI</translation> <translation>ACCEDI</translation>
</message> </message>
@ -547,12 +547,12 @@ Esempio: https://server.mio:8787</translation>
<translation>ACCESSO SSO</translation> <translation>ACCESSO SSO</translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Password vuota</translation> <translation>Password vuota</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation>Accesso SSO fallito</translation> <translation>Accesso SSO fallito</translation>
</message> </message>
@ -752,22 +752,23 @@ Esempio: https://server.mio:8787</translation>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Nome utente</translation> <translation>Nome utente</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation>Il nome utente non deve essere vuoto e deve contenere solo i caratteri a-z, 0-9, ., _, =, -, e /.</translation> <translation>Il nome utente non deve essere vuoto e deve contenere solo i caratteri a-z, 0-9, ., _, =, -, e /.</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Password</translation> <translation>Password</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation>Per favore scegli una password sicura. I requisiti di robustezza della password potrebbero dipendere dal server.</translation> <translation>Per favore scegli una password sicura. I requisiti di robustezza della password potrebbero dipendere dal server.</translation>
</message> </message>
@ -787,32 +788,32 @@ Esempio: https://server.mio:8787</translation>
<translation>Un server che consente la registrazione. Siccome matrix è decentralizzata, devi prima trovare un server su cui registrarti o ospitarne uno tuo.</translation> <translation>Un server che consente la registrazione. Siccome matrix è decentralizzata, devi prima trovare un server su cui registrarti o ospitarne uno tuo.</translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>REGISTRATI</translation> <translation>REGISTRATI</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation>Non ci sono processi di registrazione supportati!</translation> <translation>Non ci sono processi di registrazione supportati!</translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Nome utente non valido</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>La password non è abbastanza lunga (minimo 8 caratteri)</translation> <translation>La password non è abbastanza lunga (minimo 8 caratteri)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>Le password non corrispondono</translation> <translation>Le password non corrispondono</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Nome del server non valido</translation> <translation>Nome del server non valido</translation>
</message> </message>
@ -2064,7 +2065,7 @@ Peso media: %2
<translation>Crittografia</translation> <translation>Crittografia</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation>Crittografia End-to-End</translation> <translation>Crittografia End-to-End</translation>
</message> </message>
@ -2074,7 +2075,7 @@ Peso media: %2
<translation>La crittografia è ancora sperimentale e le cose potrebbero rompersi inaspettatamente. &lt;br&gt;Per favore prendi nota che in seguito non potrà essere disabilitata.</translation> <translation>La crittografia è ancora sperimentale e le cose potrebbero rompersi inaspettatamente. &lt;br&gt;Per favore prendi nota che in seguito non potrà essere disabilitata.</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation>Rispondi alle richieste di chiavi</translation> <translation>Rispondi alle richieste di chiavi</translation>
</message> </message>
@ -2088,7 +2089,7 @@ Peso media: %2
l&apos;implementazione di E2E fino al completamento della verifica dei dispositivi.</translation> l&apos;implementazione di E2E fino al completamento della verifica dei dispositivi.</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n membro</numerusform> <numerusform>%n membro</numerusform>
@ -2096,7 +2097,7 @@ Peso media: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>Impossibile abilitare la crittografia: %1</translation> <translation>Impossibile abilitare la crittografia: %1</translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation>: %1</translation> <translation>: %1</translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation>: %1</translation> <translation>: %1</translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation>: %1 %2. </translation> <translation>: %1 %2. </translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation></translation> <translation></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>Matrix ID</translation> <translation>Matrix ID</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation> @joe:matrix.org</translation> <translation> @joe:matrix.org</translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation></translation> <translation></translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation> (8)</translation> <translation> (8)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation></translation> <translation></translation>
</message> </message>
@ -2059,7 +2060,7 @@ Media size: %2
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation></translation> <translation></translation>
</message> </message>
@ -2069,7 +2070,7 @@ Media size: %2
<translation> &lt;br&gt;</translation> <translation> &lt;br&gt;</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation></translation> <translation></translation>
</message> </message>
@ -2083,14 +2084,14 @@ Media size: %2
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n人</numerusform> <numerusform>%n人</numerusform>
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>: %1</translation> <translation>: %1</translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>Matrix-id</translation> <translation>Matrix-id</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>b.v @jan:matrix.org&lt;</translation> <translation>b.v @jan:matrix.org&lt;</translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>INLOGGEN</translation> <translation>INLOGGEN</translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Leeg wachtwoord</translation> <translation>Leeg wachtwoord</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Gebruikersnaam</translation> <translation>Gebruikersnaam</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Wachtwoord</translation> <translation>Wachtwoord</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>REGISTREREN</translation> <translation>REGISTREREN</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Ongeldige gebruikersnaam</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>Het wachtwoord is niet lang genoeg (minimaal 8 tekens)</translation> <translation>Het wachtwoord is niet lang genoeg (minimaal 8 tekens)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>De wachtwoorden komen niet overeen</translation> <translation>De wachtwoorden komen niet overeen</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Ongeldige servernaam</translation> <translation>Ongeldige servernaam</translation>
</message> </message>
@ -2060,7 +2061,7 @@ Mediagrootte: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2070,7 +2071,7 @@ Mediagrootte: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2082,7 +2083,7 @@ Mediagrootte: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -2090,7 +2091,7 @@ Mediagrootte: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation>Nie udało się przywrócić zapisanych danych. Spróbuj zalogować się ponownie.</translation> <translation>Nie udało się przywrócić zapisanych danych. Spróbuj zalogować się ponownie.</translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>ID Matrixa</translation> <translation>ID Matrixa</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>np. @joe:matrix.org</translation> <translation>np. @joe:matrix.org</translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>ZALOGUJ</translation> <translation>ZALOGUJ</translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Puste hasło</translation> <translation>Puste hasło</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Nazwa użytkownika</translation> <translation>Nazwa użytkownika</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Hasło</translation> <translation>Hasło</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>ZAREJESTRUJ</translation> <translation>ZAREJESTRUJ</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Nieprawidłowa nazwa użytkownika</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>Hasło jest zbyt krótkie (min. 8 znaków)</translation> <translation>Hasło jest zbyt krótkie (min. 8 znaków)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>Hasła nie pasują do siebie</translation> <translation>Hasła nie pasują do siebie</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Nieprawidłowa nazwa serwera</translation> <translation>Nieprawidłowa nazwa serwera</translation>
</message> </message>
@ -2061,7 +2062,7 @@ Rozmiar multimediów: %2
<translation>Szyfrowanie</translation> <translation>Szyfrowanie</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation>Szyfrowanie end-to-end</translation> <translation>Szyfrowanie end-to-end</translation>
</message> </message>
@ -2071,7 +2072,7 @@ Rozmiar multimediów: %2
<translation>Szyfrowanie jest obecnie eksperymentalne i może spowodować nieoczekiwane błędy. &lt;br&gt;Zapamiętaj, że nie może zostać później wyłączona.</translation> <translation>Szyfrowanie jest obecnie eksperymentalne i może spowodować nieoczekiwane błędy. &lt;br&gt;Zapamiętaj, że nie może zostać później wyłączona.</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation>Odpowiadaj na żądania o klucze</translation> <translation>Odpowiadaj na żądania o klucze</translation>
</message> </message>
@ -2085,7 +2086,7 @@ Rozmiar multimediów: %2
do testowania implementacji E2E, zanim weryfikacja urządzeń będzie ukończona.</translation> do testowania implementacji E2E, zanim weryfikacja urządzeń będzie ukończona.</translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n członek</numerusform> <numerusform>%n członek</numerusform>
@ -2094,7 +2095,7 @@ Rozmiar multimediów: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>Nie udało się włączyć szyfrowania: %1</translation> <translation>Nie udało się włączyć szyfrowania: %1</translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2058,7 +2059,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2068,7 +2069,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2080,7 +2081,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -2088,7 +2089,7 @@ Media size: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2059,7 +2060,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2069,7 +2070,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2081,7 +2082,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -2090,7 +2091,7 @@ Media size: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation>Приглашённый пользователь: %1</translation> <translation>Приглашённый пользователь: %1</translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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>Миграция кэша для текущей версии не удалась. Это может происходить по разным причинам. Пожалуйста сообщите о проблеме и попробуйте временно использовать старую версию. Так-же вы можете попробовать удалить кэш самостоятельно.</translation> <translation>Миграция кэша для текущей версии не удалась. Это может происходить по разным причинам. Пожалуйста сообщите о проблеме и попробуйте временно использовать старую версию. Так-же вы можете попробовать удалить кэш самостоятельно.</translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation>Комната %1 создана.</translation> <translation>Комната %1 создана.</translation>
</message> </message>
@ -139,7 +139,7 @@
<translation>Разблокированный пользователь: %1</translation> <translation>Разблокированный пользователь: %1</translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation>Миграция кэша не удалась!</translation> <translation>Миграция кэша не удалась!</translation>
</message> </message>
@ -164,7 +164,7 @@
<translation>Не удалось восстановить сохраненные данные. Пожалуйста, войдите снова.</translation> <translation>Не удалось восстановить сохраненные данные. Пожалуйста, войдите снова.</translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation>Не удалось настроить ключи шифрования. Ответ сервера:%1 %2. Пожалуйста, попробуйте позже.</translation> <translation>Не удалось настроить ключи шифрования. Ответ сервера:%1 %2. Пожалуйста, попробуйте позже.</translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation>Применить</translation> <translation>Применить</translation>
</message> </message>
@ -473,7 +473,7 @@
<translation>Идентификатор Matrix</translation> <translation>Идентификатор Matrix</translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation>Пример: @joe:matrix.org</translation> <translation>Пример: @joe:matrix.org</translation>
</message> </message>
@ -512,7 +512,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation>ВОЙТИ</translation> <translation>ВОЙТИ</translation>
</message> </message>
@ -547,12 +547,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation>Пустой пароль</translation> <translation>Пустой пароль</translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation>SSO вход не удался</translation> <translation>SSO вход не удался</translation>
</message> </message>
@ -752,22 +752,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation>Имя пользователя</translation> <translation>Имя пользователя</translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation>Имя пользователя не должно быть пустым и должно содержать только символы a-z, 0-9, ., _, =, -, and /.</translation> <translation>Имя пользователя не должно быть пустым и должно содержать только символы a-z, 0-9, ., _, =, -, and /.</translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation>Пароль</translation> <translation>Пароль</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -787,32 +788,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation>РЕГИСТРАЦИЯ</translation> <translation>РЕГИСТРАЦИЯ</translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation>Некорректное имя пользователя</translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>Слишком короткий пароль (минимум 8 символов)</translation> <translation>Слишком короткий пароль (минимум 8 символов)</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation>Пароли не совпадают</translation> <translation>Пароли не совпадают</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation>Неверное имя сервера</translation> <translation>Неверное имя сервера</translation>
</message> </message>
@ -2066,7 +2067,7 @@ Media size: %2
<translation>Шифрование</translation> <translation>Шифрование</translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation>Сквозное шифрование</translation> <translation>Сквозное шифрование</translation>
</message> </message>
@ -2076,7 +2077,7 @@ Media size: %2
<translation>Шифрование в настоящее время является экспериментальным, поэтому возможны сбои. &lt;br&gt;Пожалуйста, имейте ввиду, что его нельзя отключить впоследствии.</translation> <translation>Шифрование в настоящее время является экспериментальным, поэтому возможны сбои. &lt;br&gt;Пожалуйста, имейте ввиду, что его нельзя отключить впоследствии.</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2088,7 +2089,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n участник</numerusform> <numerusform>%n участник</numerusform>
@ -2097,7 +2098,7 @@ Media size: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>Не удалось включить шифрование: %1</translation> <translation>Не удалось включить шифрование: %1</translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2058,7 +2059,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2068,7 +2069,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2080,7 +2081,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -2088,7 +2089,7 @@ Media size: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2058,7 +2059,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2068,7 +2069,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -2080,7 +2081,7 @@ Media size: %2
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation type="unfinished"> <translation type="unfinished">
<numerusform></numerusform> <numerusform></numerusform>
@ -2088,7 +2089,7 @@ Media size: %2
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>

View File

@ -49,17 +49,17 @@
</message> </message>
<message> <message>
<location line="+4"/> <location line="+4"/>
<location line="+767"/> <location line="+766"/>
<source>Invited user: %1</source> <source>Invited user: %1</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-495"/> <location line="-494"/>
<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> <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> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+451"/> <location line="+450"/>
<source>Room %1 created.</source> <source>Room %1 created.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -139,7 +139,7 @@
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="-577"/> <location line="-576"/>
<source>Cache migration failed!</source> <source>Cache migration failed!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -164,7 +164,7 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+166"/> <location line="+165"/>
<source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source> <source>Failed to setup encryption keys. Server response: %1 %2. Please try again later.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -261,7 +261,7 @@
<context> <context>
<name>EditModal</name> <name>EditModal</name>
<message> <message>
<location filename="../../src/dialogs/RoomSettings.cpp" line="+74"/> <location filename="../../src/dialogs/RoomSettings.cpp" line="+73"/>
<source>Apply</source> <source>Apply</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -473,7 +473,7 @@
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+1"/> <location line="+2"/>
<source>e.g @joe:matrix.org</source> <source>e.g @joe:matrix.org</source>
<translation> @joe:matrix.org</translation> <translation> @joe:matrix.org</translation>
</message> </message>
@ -508,7 +508,7 @@ Example: https://server.my:8787</source>
</message> </message>
<message> <message>
<location line="+19"/> <location line="+19"/>
<location line="+220"/> <location line="+216"/>
<source>LOGIN</source> <source>LOGIN</source>
<translation></translation> <translation></translation>
</message> </message>
@ -543,12 +543,12 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+35"/> <location line="+37"/>
<source>Empty password</source> <source>Empty password</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+52"/> <location line="+54"/>
<source>SSO login failed</source> <source>SSO login failed</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -748,22 +748,23 @@ Example: https://server.my:8787</source>
<context> <context>
<name>RegisterPage</name> <name>RegisterPage</name>
<message> <message>
<location filename="../../src/RegisterPage.cpp" line="+88"/> <location filename="../../src/RegisterPage.cpp" line="+89"/>
<source>Username</source> <source>Username</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+3"/> <location line="+2"/>
<location line="+291"/>
<source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source> <source>The username must not be empty, and must contain only the characters a-z, 0-9, ., _, =, -, and /.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+4"/> <location line="-287"/>
<source>Password</source> <source>Password</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+3"/>
<source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source> <source>Please choose a secure password. The exact requirements for password strength may depend on your server.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
@ -783,32 +784,32 @@ Example: https://server.my:8787</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+17"/> <location line="+36"/>
<source>REGISTER</source> <source>REGISTER</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+55"/> <location line="+62"/>
<source>No supported registration flows!</source> <source>No supported registration flows!</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+135"/> <location line="+200"/>
<source>Invalid username</source> <source>Regisration Failed</source>
<translation></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="-19"/>
<source>Password is not long enough (min 8 chars)</source> <source>Password is not long enough (min 8 chars)</source>
<translation>8</translation> <translation>8</translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Passwords don&apos;t match</source> <source>Passwords don&apos;t match</source>
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+2"/> <location line="+4"/>
<source>Invalid server name</source> <source>Invalid server name</source>
<translation></translation> <translation></translation>
</message> </message>
@ -2059,7 +2060,7 @@ Media size: %2
<translation></translation> <translation></translation>
</message> </message>
<message> <message>
<location line="+8"/> <location line="+31"/>
<source>End-to-End Encryption</source> <source>End-to-End Encryption</source>
<translation></translation> <translation></translation>
</message> </message>
@ -2069,7 +2070,7 @@ Media size: %2
<translation>&lt;br&gt;</translation> <translation>&lt;br&gt;</translation>
</message> </message>
<message> <message>
<location line="+27"/> <location line="-24"/>
<source>Respond to key requests</source> <source>Respond to key requests</source>
<translation></translation> <translation></translation>
</message> </message>
@ -2083,14 +2084,14 @@ Media size: %2
</translation> </translation>
</message> </message>
<message numerus="yes"> <message numerus="yes">
<location line="+51"/> <location line="+80"/>
<source>%n member(s)</source> <source>%n member(s)</source>
<translation> <translation>
<numerusform>%n </numerusform> <numerusform>%n </numerusform>
</translation> </translation>
</message> </message>
<message> <message>
<location line="+140"/> <location line="+142"/>
<source>Failed to enable encryption: %1</source> <source>Failed to enable encryption: %1</source>
<translation>%1</translation> <translation>%1</translation>
</message> </message>

View File

@ -90,6 +90,7 @@ LoginPage::LoginPage(QWidget *parent)
matrixid_input_ = new TextField(this); matrixid_input_ = new TextField(this);
matrixid_input_->setLabel(tr("Matrix ID")); matrixid_input_->setLabel(tr("Matrix ID"));
matrixid_input_->setRegexp(QRegularExpression("@.+?:.{3,}"));
matrixid_input_->setPlaceholderText(tr("e.g @joe:matrix.org")); matrixid_input_->setPlaceholderText(tr("e.g @joe:matrix.org"));
matrixid_input_->setToolTip( matrixid_input_->setToolTip(
tr("Your login name. A mxid should start with @ followed by the user id. After the user " tr("Your login name. A mxid should start with @ followed by the user id. After the user "
@ -175,7 +176,6 @@ LoginPage::LoginPage(QWidget *parent)
connect(this, &LoginPage::versionOkCb, this, &LoginPage::versionOk); connect(this, &LoginPage::versionOkCb, this, &LoginPage::versionOk);
connect(this, &LoginPage::versionErrorCb, this, &LoginPage::versionError); connect(this, &LoginPage::versionErrorCb, this, &LoginPage::versionError);
connect(this, &LoginPage::loginErrorCb, this, &LoginPage::loginError);
connect(back_button_, SIGNAL(clicked()), this, SLOT(onBackButtonClicked())); connect(back_button_, SIGNAL(clicked()), this, SLOT(onBackButtonClicked()));
connect(login_button_, SIGNAL(clicked()), this, SLOT(onLoginButtonClicked())); connect(login_button_, SIGNAL(clicked()), this, SLOT(onLoginButtonClicked()));
@ -186,32 +186,24 @@ LoginPage::LoginPage(QWidget *parent)
connect(matrixid_input_, SIGNAL(editingFinished()), this, SLOT(onMatrixIdEntered())); connect(matrixid_input_, SIGNAL(editingFinished()), this, SLOT(onMatrixIdEntered()));
connect(serverInput_, SIGNAL(editingFinished()), this, SLOT(onServerAddressEntered())); connect(serverInput_, SIGNAL(editingFinished()), this, SLOT(onServerAddressEntered()));
} }
void void
LoginPage::loginError(const QString &msg) LoginPage::showError(const QString &msg)
{ {
auto rect = QFontMetrics(font()).boundingRect(msg); auto rect = QFontMetrics(font()).boundingRect(msg);
int width = rect.width(); int width = rect.width();
int height = rect.height(); int height = rect.height();
error_label_->setFixedHeight(qCeil(width / 200) * height); error_label_->setFixedHeight((int)qCeil(width / 200.0) * height);
error_label_->setText(msg); error_label_->setText(msg);
} }
void void
LoginPage::matrixIdError(const QString &msg) LoginPage::showError(QLabel *label, const QString &msg)
{ {
error_matrixid_label_->show(); auto rect = QFontMetrics(font()).boundingRect(msg);
error_matrixid_label_->setText(msg); int width = rect.width();
matrixid_input_->setValid(false); int height = rect.height();
} label->setFixedHeight((int)qCeil(width / 200.0) * height);
label->setText(msg);
bool
LoginPage::isMatrixIdValid()
{
QRegularExpressionValidator v(QRegularExpression("@.+?:.{3,}"), this);
QString s = matrixid_input_->text();
int pos = 0;
return v.validate(s, pos) == QValidator::Acceptable;
} }
void void
@ -221,19 +213,21 @@ LoginPage::onMatrixIdEntered()
User user; User user;
if (!isMatrixIdValid()) { if (!matrixid_input_->isValid()) {
matrixIdError("You have entered an invalid Matrix ID e.g @joe:matrix.org"); error_matrixid_label_->show();
showError(error_matrixid_label_,
"You have entered an invalid Matrix ID e.g @joe:matrix.org");
return; return;
} else { } else {
error_matrixid_label_->setText(""); error_matrixid_label_->setText("");
error_matrixid_label_->hide(); error_matrixid_label_->hide();
matrixid_input_->setValid(true);
} }
try { try {
user = parse<User>(matrixid_input_->text().toStdString()); user = parse<User>(matrixid_input_->text().toStdString());
} catch (const std::exception &e) { } catch (const std::exception &e) {
matrixIdError("You have entered an invalid Matrix ID e.g @joe:matrix.org"); showError(error_matrixid_label_,
"You have entered an invalid Matrix ID e.g @joe:matrix.org");
return; return;
} }
@ -345,7 +339,7 @@ LoginPage::onServerAddressEntered()
void void
LoginPage::versionError(const QString &error) LoginPage::versionError(const QString &error)
{ {
loginError(error); showError(error_label_, error);
serverInput_->show(); serverInput_->show();
spinner_->stop(); spinner_->stop();
@ -383,25 +377,27 @@ LoginPage::onLoginButtonClicked()
User user; User user;
if (!isMatrixIdValid()) { if (!matrixid_input_->isValid()) {
matrixIdError("You have entered an invalid Matrix ID e.g @joe:matrix.org"); error_matrixid_label_->show();
showError(error_matrixid_label_,
"You have entered an invalid Matrix ID e.g @joe:matrix.org");
return; return;
} else { } else {
error_matrixid_label_->setText(""); error_matrixid_label_->setText("");
error_matrixid_label_->hide(); error_matrixid_label_->hide();
matrixid_input_->setValid(true);
} }
try { try {
user = parse<User>(matrixid_input_->text().toStdString()); user = parse<User>(matrixid_input_->text().toStdString());
} catch (const std::exception &e) { } catch (const std::exception &e) {
matrixIdError("You have entered an invalid Matrix ID e.g @joe:matrix.org"); showError(error_matrixid_label_,
"You have entered an invalid Matrix ID e.g @joe:matrix.org");
return; return;
} }
if (loginMethod == LoginMethod::Password) { if (loginMethod == LoginMethod::Password) {
if (password_input_->text().isEmpty()) if (password_input_->text().isEmpty())
return loginError(tr("Empty password")); return showError(error_label_, tr("Empty password"));
http::client()->login( http::client()->login(
user.localpart(), user.localpart(),
@ -410,7 +406,8 @@ LoginPage::onLoginButtonClicked()
: deviceName_->text().toStdString(), : deviceName_->text().toStdString(),
[this](const mtx::responses::Login &res, mtx::http::RequestErr err) { [this](const mtx::responses::Login &res, mtx::http::RequestErr err) {
if (err) { if (err) {
emit loginError(QString::fromStdString(err->matrix_error.error)); showError(error_label_,
QString::fromStdString(err->matrix_error.error));
emit errorOccurred(); emit errorOccurred();
return; return;
} }
@ -435,7 +432,8 @@ LoginPage::onLoginButtonClicked()
http::client()->login( http::client()->login(
req, [this](const mtx::responses::Login &res, mtx::http::RequestErr err) { req, [this](const mtx::responses::Login &res, mtx::http::RequestErr err) {
if (err) { if (err) {
emit loginError( showError(
error_label_,
QString::fromStdString(err->matrix_error.error)); QString::fromStdString(err->matrix_error.error));
emit errorOccurred(); emit errorOccurred();
return; return;
@ -453,7 +451,7 @@ LoginPage::onLoginButtonClicked()
sso->deleteLater(); sso->deleteLater();
}); });
connect(sso, &SSOHandler::ssoFailed, this, [this, sso]() { connect(sso, &SSOHandler::ssoFailed, this, [this, sso]() {
emit loginError(tr("SSO login failed")); showError(error_label_, tr("SSO login failed"));
emit errorOccurred(); emit errorOccurred();
sso->deleteLater(); sso->deleteLater();
}); });

View File

@ -56,7 +56,6 @@ signals:
//! Used to trigger the corresponding slot outside of the main thread. //! Used to trigger the corresponding slot outside of the main thread.
void versionErrorCb(const QString &err); void versionErrorCb(const QString &err);
void loginErrorCb(const QString &err);
void versionOkCb(LoginPage::LoginMethod method); void versionOkCb(LoginPage::LoginMethod method);
void loginOk(const mtx::responses::Login &res); void loginOk(const mtx::responses::Login &res);
@ -66,8 +65,8 @@ protected:
public slots: public slots:
// Displays errors produced during the login. // Displays errors produced during the login.
void loginError(const QString &msg); void showError(const QString &msg);
void matrixIdError(const QString &msg); void showError(QLabel *label, const QString &msg);
private slots: private slots:
// Callback for the back button. // Callback for the back button.
@ -88,7 +87,6 @@ private slots:
void versionOk(LoginPage::LoginMethod method); void versionOk(LoginPage::LoginMethod method);
private: private:
bool isMatrixIdValid();
void checkHomeserverVersion(); void checkHomeserverVersion();
std::string initialDeviceName() std::string initialDeviceName()
{ {

View File

@ -108,7 +108,7 @@ MainWindow::MainWindow(const QString profile, QWidget *parent)
connect(chat_page_, &ChatPage::unreadMessages, this, &MainWindow::setWindowTitle); connect(chat_page_, &ChatPage::unreadMessages, this, &MainWindow::setWindowTitle);
connect(chat_page_, SIGNAL(unreadMessages(int)), trayIcon_, SLOT(setUnreadCount(int))); connect(chat_page_, SIGNAL(unreadMessages(int)), trayIcon_, SLOT(setUnreadCount(int)));
connect(chat_page_, &ChatPage::showLoginPage, this, [this](const QString &msg) { connect(chat_page_, &ChatPage::showLoginPage, this, [this](const QString &msg) {
login_page_->loginError(msg); login_page_->showError(msg);
showLoginPage(); showLoginPage();
}); });

View File

@ -20,6 +20,7 @@
#include <QPainter> #include <QPainter>
#include <QStyleOption> #include <QStyleOption>
#include <QTimer> #include <QTimer>
#include <QtMath>
#include <mtx/responses/register.hpp> #include <mtx/responses/register.hpp>
@ -86,13 +87,13 @@ RegisterPage::RegisterPage(QWidget *parent)
username_input_ = new TextField(); username_input_ = new TextField();
username_input_->setLabel(tr("Username")); username_input_->setLabel(tr("Username"));
username_input_->setValidator( username_input_->setRegexp(QRegularExpression("[a-z0-9._=/-]+"));
new QRegularExpressionValidator(QRegularExpression("[a-z0-9._=/-]+"), this));
username_input_->setToolTip(tr("The username must not be empty, and must contain only the " username_input_->setToolTip(tr("The username must not be empty, and must contain only the "
"characters a-z, 0-9, ., _, =, -, and /.")); "characters a-z, 0-9, ., _, =, -, and /."));
password_input_ = new TextField(); password_input_ = new TextField();
password_input_->setLabel(tr("Password")); password_input_->setLabel(tr("Password"));
password_input_->setRegexp(QRegularExpression("^.{8,}$"));
password_input_->setEchoMode(QLineEdit::Password); password_input_->setEchoMode(QLineEdit::Password);
password_input_->setToolTip(tr("Please choose a secure password. The exact requirements " password_input_->setToolTip(tr("Please choose a secure password. The exact requirements "
"for password strength may depend on your server.")); "for password strength may depend on your server."));
@ -107,19 +108,32 @@ RegisterPage::RegisterPage(QWidget *parent)
tr("A server that allows registration. Since matrix is decentralized, you need to first " tr("A server that allows registration. Since matrix is decentralized, you need to first "
"find a server you can register on or host your own.")); "find a server you can register on or host your own."));
error_username_label_ = new QLabel(this);
error_username_label_->setWordWrap(true);
error_username_label_->hide();
error_password_label_ = new QLabel(this);
error_password_label_->setWordWrap(true);
error_password_label_->hide();
error_password_confirmation_label_ = new QLabel(this);
error_password_confirmation_label_->setWordWrap(true);
error_password_confirmation_label_->hide();
form_layout_->addWidget(username_input_, Qt::AlignHCenter); form_layout_->addWidget(username_input_, Qt::AlignHCenter);
form_layout_->addWidget(error_username_label_, Qt::AlignHCenter);
form_layout_->addWidget(password_input_, Qt::AlignHCenter); form_layout_->addWidget(password_input_, Qt::AlignHCenter);
form_layout_->addWidget(error_password_label_, Qt::AlignHCenter);
form_layout_->addWidget(password_confirmation_, Qt::AlignHCenter); form_layout_->addWidget(password_confirmation_, Qt::AlignHCenter);
form_layout_->addWidget(error_password_confirmation_label_, Qt::AlignHCenter);
form_layout_->addWidget(server_input_, Qt::AlignHCenter); form_layout_->addWidget(server_input_, Qt::AlignHCenter);
button_layout_ = new QHBoxLayout(); button_layout_ = new QHBoxLayout();
button_layout_->setSpacing(0); button_layout_->setSpacing(0);
button_layout_->setMargin(0); button_layout_->setMargin(0);
QFont font;
error_label_ = new QLabel(this); error_label_ = new QLabel(this);
error_label_->setFont(font); error_label_->setWordWrap(true);
register_button_ = new RaisedButton(tr("REGISTER"), this); register_button_ = new RaisedButton(tr("REGISTER"), this);
register_button_->setMinimumSize(350, 65); register_button_->setMinimumSize(350, 65);
@ -135,17 +149,24 @@ RegisterPage::RegisterPage(QWidget *parent)
top_layout_->addLayout(form_wrapper_); top_layout_->addLayout(form_wrapper_);
top_layout_->addStretch(1); top_layout_->addStretch(1);
top_layout_->addLayout(button_layout_); top_layout_->addLayout(button_layout_);
top_layout_->addStretch(1);
top_layout_->addWidget(error_label_, 0, Qt::AlignHCenter); top_layout_->addWidget(error_label_, 0, Qt::AlignHCenter);
top_layout_->addStretch(1);
connect(back_button_, SIGNAL(clicked()), this, SLOT(onBackButtonClicked())); connect(back_button_, SIGNAL(clicked()), this, SLOT(onBackButtonClicked()));
connect(register_button_, SIGNAL(clicked()), this, SLOT(onRegisterButtonClicked())); connect(register_button_, SIGNAL(clicked()), this, SLOT(onRegisterButtonClicked()));
connect(username_input_, SIGNAL(returnPressed()), register_button_, SLOT(click())); connect(username_input_, SIGNAL(returnPressed()), register_button_, SLOT(click()));
connect(username_input_, &TextField::editingFinished, this, &RegisterPage::checkFields);
connect(password_input_, SIGNAL(returnPressed()), register_button_, SLOT(click())); connect(password_input_, SIGNAL(returnPressed()), register_button_, SLOT(click()));
connect(password_input_, &TextField::editingFinished, this, &RegisterPage::checkFields);
connect(password_confirmation_, SIGNAL(returnPressed()), register_button_, SLOT(click())); connect(password_confirmation_, SIGNAL(returnPressed()), register_button_, SLOT(click()));
connect(
password_confirmation_, &TextField::editingFinished, this, &RegisterPage::checkFields);
connect(server_input_, SIGNAL(returnPressed()), register_button_, SLOT(click())); connect(server_input_, SIGNAL(returnPressed()), register_button_, SLOT(click()));
connect(this, &RegisterPage::registerErrorCb, this, &RegisterPage::registerError); connect(server_input_, &TextField::editingFinished, this, &RegisterPage::checkFields);
connect(this, &RegisterPage::registerErrorCb, this, [this](const QString &msg) {
showError(msg);
});
connect( connect(
this, this,
&RegisterPage::registrationFlow, &RegisterPage::registrationFlow,
@ -299,25 +320,93 @@ RegisterPage::onBackButtonClicked()
} }
void void
RegisterPage::registerError(const QString &msg) RegisterPage::showError(const QString &msg)
{ {
emit errorOccurred(); emit errorOccurred();
auto rect = QFontMetrics(font()).boundingRect(msg);
int width = rect.width();
int height = rect.height();
error_label_->setFixedHeight(qCeil(width / 200.0) * height);
error_label_->setText(msg); error_label_->setText(msg);
} }
void
RegisterPage::showError(QLabel *label, const QString &msg)
{
emit errorOccurred();
auto rect = QFontMetrics(font()).boundingRect(msg);
int width = rect.width();
int height = rect.height();
label->setFixedHeight((int)qCeil(width / 200.0) * height);
label->setText(msg);
}
bool
RegisterPage::checkOneField(QLabel *label, const TextField *t_field, const QString &msg)
{
if (t_field->isValid()) {
label->setText("");
label->hide();
return true;
} else {
label->show();
showError(label, msg);
return false;
}
}
bool
RegisterPage::checkFields()
{
error_label_->setText("");
error_username_label_->setText("");
error_password_label_->setText("");
error_password_confirmation_label_->setText("");
error_username_label_->hide();
error_password_label_->hide();
error_password_confirmation_label_->hide();
password_confirmation_->setValid(true);
server_input_->setValid(true);
bool all_fields_good = true;
if (username_input_->isModified() &&
!checkOneField(error_username_label_,
username_input_,
tr("The username must not be empty, and must contain only the "
"characters a-z, 0-9, ., _, =, -, and /."))) {
all_fields_good = false;
} else if (password_input_->isModified() &&
!checkOneField(error_password_label_,
password_input_,
tr("Password is not long enough (min 8 chars)"))) {
all_fields_good = false;
} else if (password_confirmation_->isModified() &&
password_input_->text() != password_confirmation_->text()) {
error_password_confirmation_label_->show();
showError(error_password_confirmation_label_, tr("Passwords don't match"));
password_confirmation_->setValid(false);
all_fields_good = false;
} else if (server_input_->isModified() &&
(!server_input_->hasAcceptableInput() || server_input_->text().isEmpty())) {
showError(tr("Invalid server name"));
server_input_->setValid(false);
all_fields_good = false;
}
if (!username_input_->isModified() || !password_input_->isModified() ||
!password_confirmation_->isModified() || !server_input_->isModified()) {
all_fields_good = false;
}
return all_fields_good;
}
void void
RegisterPage::onRegisterButtonClicked() RegisterPage::onRegisterButtonClicked()
{ {
error_label_->setText(""); if (!checkFields()) {
showError(error_label_, tr("One or more fields have invalid inputs. Please correct those issues and try again."));
if (!username_input_->hasAcceptableInput()) { return;
registerError(tr("Invalid username"));
} else if (!password_input_->hasAcceptableInput()) {
registerError(tr("Password is not long enough (min 8 chars)"));
} else if (password_input_->text() != password_confirmation_->text()) {
registerError(tr("Passwords don't match"));
} else if (!server_input_->hasAcceptableInput()) {
registerError(tr("Invalid server name"));
} else { } else {
auto username = username_input_->text().toStdString(); auto username = username_input_->text().toStdString();
auto password = password_input_->text().toStdString(); auto password = password_input_->text().toStdString();

View File

@ -57,10 +57,13 @@ private slots:
void onBackButtonClicked(); void onBackButtonClicked();
void onRegisterButtonClicked(); void onRegisterButtonClicked();
// Display registration specific errors to the user. // function for showing different errors
void registerError(const QString &msg); void showError(const QString &msg);
private: private:
bool checkOneField(QLabel *label, const TextField *t_field, const QString &msg);
bool checkFields();
void showError(QLabel *label, const QString &msg);
QVBoxLayout *top_layout_; QVBoxLayout *top_layout_;
QHBoxLayout *back_layout_; QHBoxLayout *back_layout_;
@ -69,6 +72,9 @@ private:
QLabel *logo_; QLabel *logo_;
QLabel *error_label_; QLabel *error_label_;
QLabel *error_username_label_;
QLabel *error_password_label_;
QLabel *error_password_confirmation_label_;
FlatButton *back_button_; FlatButton *back_button_;
RaisedButton *register_button_; RaisedButton *register_button_;

View File

@ -6,6 +6,7 @@
#include <QPaintEvent> #include <QPaintEvent>
#include <QPainter> #include <QPainter>
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QRegularExpressionValidator>
TextField::TextField(QWidget *parent) TextField::TextField(QWidget *parent)
: QLineEdit(parent) : QLineEdit(parent)
@ -70,18 +71,24 @@ TextField::hasLabel() const
return show_label_; return show_label_;
} }
bool
TextField::isValid() const
{
return is_valid_;
}
void void
TextField::setValid(bool valid) TextField::setValid(bool valid)
{ {
is_valid_ = valid; is_valid_ = valid;
} }
bool
TextField::isValid() const
{
QString s = text();
int pos = 0;
if (regexp_.pattern().isEmpty()) {
return is_valid_;
}
QRegularExpressionValidator v(QRegularExpression(regexp_), 0);
return v.validate(s, pos) == QValidator::Acceptable;
}
void void
TextField::setLabelFontSize(qreal size) TextField::setLabelFontSize(qreal size)
{ {
@ -156,6 +163,12 @@ TextField::setUnderlineColor(const QColor &color)
update(); update();
} }
void
TextField::setRegexp(const QRegularExpression &regexp)
{
regexp_ = regexp;
}
QColor QColor
TextField::underlineColor() const TextField::underlineColor() const
{ {

View File

@ -4,6 +4,7 @@
#include <QLineEdit> #include <QLineEdit>
#include <QPaintEvent> #include <QPaintEvent>
#include <QPropertyAnimation> #include <QPropertyAnimation>
#include <QRegularExpression>
#include <QStateMachine> #include <QStateMachine>
#include <QtGlobal> #include <QtGlobal>
@ -30,6 +31,7 @@ public:
void setLabelFontSize(qreal size); void setLabelFontSize(qreal size);
void setShowLabel(bool value); void setShowLabel(bool value);
void setUnderlineColor(const QColor &color); void setUnderlineColor(const QColor &color);
void setRegexp(const QRegularExpression &regexp);
void setValid(bool valid); void setValid(bool valid);
QColor inkColor() const; QColor inkColor() const;
@ -56,6 +58,7 @@ private:
TextFieldLabel *label_; TextFieldLabel *label_;
TextFieldStateMachine *state_machine_; TextFieldStateMachine *state_machine_;
bool show_label_; bool show_label_;
QRegularExpression regexp_;
bool is_valid_; bool is_valid_;
qreal label_font_size_; qreal label_font_size_;
}; };