From d4b2f06a63a65e4897d6cbbb6a46df22be933b83 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 13:51:04 +0100 Subject: [PATCH 1/3] fix message appears unencrypted while in flight Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/img/e2e-pending.svg | 12 ++++++++++++ src/components/views/rooms/EventTile.js | 24 ++++++++++++++---------- 2 files changed, 26 insertions(+), 10 deletions(-) create mode 100644 res/img/e2e-pending.svg diff --git a/res/img/e2e-pending.svg b/res/img/e2e-pending.svg new file mode 100644 index 0000000000..469611cc8d --- /dev/null +++ b/res/img/e2e-pending.svg @@ -0,0 +1,12 @@ + + + +48BF5D32-306C-4B20-88EB-24B1F743CAC9 +Created with sketchtool. + + + + + + + diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 589524bb9e..50fe0928b0 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -34,6 +34,7 @@ const ContextualMenu = require('../../structures/ContextualMenu'); import dis from '../../../dispatcher'; import {makeEventPermalink} from "../../../matrix-to"; import SettingsStore from "../../../settings/SettingsStore"; +import {EventStatus} from 'matrix-js-sdk'; const ObjectUtils = require('../../../ObjectUtils'); @@ -442,7 +443,6 @@ module.exports = withMatrixClient(React.createClass({ const ev = this.props.mxEvent; const props = {onClick: this.onCryptoClicked}; - if (ev.getContent().msgtype === 'm.bad.encrypted') { return ; } else if (ev.isEncrypted()) { @@ -451,15 +451,15 @@ module.exports = withMatrixClient(React.createClass({ } else { return ; } - } else { - // XXX: if the event is being encrypted (ie eventSendStatus === - // encrypting), it might be nice to show something other than the - // open padlock? - - // if the event is not encrypted, but it's an e2e room, show the - // open padlock - const e2eEnabled = this.props.matrixClient.isRoomEncrypted(ev.getRoomId()); - if (e2eEnabled) { + } else if (this.props.matrixClient.isRoomEncrypted(ev.getRoomId())) { + // else if room is encrypted + // and event is being encrypted or is not_sent (Unknown Devices/Network Error) + if (ev.status === EventStatus.ENCRYPTING || ev.status === EventStatus.NOT_SENT) { + // XXX: if the event is being encrypted (ie eventSendStatus === encrypting), + // it might be nice to show something other than the open padlock? + return ; + } else { + // if the event is not encrypted, but it's an e2e room, show the open padlock return ; } } @@ -736,6 +736,10 @@ function E2ePadlockUndecryptable(props) { ); } +function E2ePadlockPending(props) { + return ; +} + function E2ePadlockVerified(props) { return ( Date: Wed, 13 Jun 2018 15:52:50 +0100 Subject: [PATCH 2/3] change not_sent e2e lock to match colour of text Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .../{e2e-pending.svg => e2e-encrypting.svg} | 0 res/img/e2e-not_sent.svg | 12 ++++++ src/components/views/rooms/EventTile.js | 38 +++++++++++-------- 3 files changed, 34 insertions(+), 16 deletions(-) rename res/img/{e2e-pending.svg => e2e-encrypting.svg} (100%) create mode 100644 res/img/e2e-not_sent.svg diff --git a/res/img/e2e-pending.svg b/res/img/e2e-encrypting.svg similarity index 100% rename from res/img/e2e-pending.svg rename to res/img/e2e-encrypting.svg diff --git a/res/img/e2e-not_sent.svg b/res/img/e2e-not_sent.svg new file mode 100644 index 0000000000..fca79ae547 --- /dev/null +++ b/res/img/e2e-not_sent.svg @@ -0,0 +1,12 @@ + + + +48BF5D32-306C-4B20-88EB-24B1F743CAC9 +Created with sketchtool. + + + + + + + diff --git a/src/components/views/rooms/EventTile.js b/src/components/views/rooms/EventTile.js index 50fe0928b0..9863a1c60a 100644 --- a/src/components/views/rooms/EventTile.js +++ b/src/components/views/rooms/EventTile.js @@ -443,25 +443,27 @@ module.exports = withMatrixClient(React.createClass({ const ev = this.props.mxEvent; const props = {onClick: this.onCryptoClicked}; + // event could not be decrypted if (ev.getContent().msgtype === 'm.bad.encrypted') { return ; - } else if (ev.isEncrypted()) { - if (this.state.verified) { - return ; - } else { - return ; - } - } else if (this.props.matrixClient.isRoomEncrypted(ev.getRoomId())) { + } + + // event is encrypted, display padlock corresponding to whether or not it is verified + if (ev.isEncrypted()) { + return this.state.verified ? : ; + } + + if (this.props.matrixClient.isRoomEncrypted(ev.getRoomId())) { // else if room is encrypted // and event is being encrypted or is not_sent (Unknown Devices/Network Error) - if (ev.status === EventStatus.ENCRYPTING || ev.status === EventStatus.NOT_SENT) { - // XXX: if the event is being encrypted (ie eventSendStatus === encrypting), - // it might be nice to show something other than the open padlock? - return ; - } else { - // if the event is not encrypted, but it's an e2e room, show the open padlock - return ; + if (ev.status === EventStatus.ENCRYPTING) { + return ; } + if (ev.status === EventStatus.NOT_SENT) { + return ; + } + // if the event is not encrypted, but it's an e2e room, show the open padlock + return ; } // no padlock needed @@ -736,8 +738,12 @@ function E2ePadlockUndecryptable(props) { ); } -function E2ePadlockPending(props) { - return ; +function E2ePadlockEncrypting(props) { + return ; +} + +function E2ePadlockNotSent(props) { + return ; } function E2ePadlockVerified(props) { From ac77b2d9ec1106427f0e887f416deb3b7eed04bc Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Wed, 13 Jun 2018 16:00:57 +0100 Subject: [PATCH 3/3] run gen-i18n and prune-i18n Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/i18n/strings/de_DE.json | 3 -- src/i18n/strings/en_EN.json | 64 ++++++++++++++++++----------------- src/i18n/strings/eu.json | 7 ---- src/i18n/strings/fr.json | 8 ----- src/i18n/strings/hu.json | 8 ----- src/i18n/strings/is.json | 1 - src/i18n/strings/it.json | 3 -- src/i18n/strings/ru.json | 4 --- src/i18n/strings/sv.json | 2 -- src/i18n/strings/zh_Hant.json | 3 -- 10 files changed, 33 insertions(+), 70 deletions(-) diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index aaf51f0d9e..c3ff855020 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -1168,9 +1168,6 @@ "At this time it is not possible to reply with an emote.": "An dieser Stelle ist es nicht möglich mit einer Umschreibung zu antworten.", "Enable widget screenshots on supported widgets": "Widget-Screenshots bei unterstützten Widgets aktivieren", "Send analytics data": "Analysedaten senden", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden. (Siehe unsere Datenschutzerklärung).", - "Help improve Riot by sending usage data? This will use a cookie.": "Möchtest du Riot helfen indem du Nutzungsdaten sendest? Dies wird ein Cookie verwenden.", - "Yes please": "Ja, bitte", "e.g. %(exampleValue)s": "z.B. %(exampleValue)s", "Reload widget": "Widget neu laden", "To notify everyone in the room, you must be a": "Notwendiges Berechtigungslevel, um jeden im Raum zu benachrichten:", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index f182ecdbad..1a761c2c5c 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -42,6 +42,10 @@ "The file '%(fileName)s' failed to upload": "The file '%(fileName)s' failed to upload", "The file '%(fileName)s' exceeds this home server's size limit for uploads": "The file '%(fileName)s' exceeds this home server's size limit for uploads", "Upload Failed": "Upload Failed", + "Failure to create room": "Failure to create room", + "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", + "Send anyway": "Send anyway", + "Send": "Send", "Sun": "Sun", "Mon": "Mon", "Tue": "Tue", @@ -81,6 +85,7 @@ "Failed to invite users to community": "Failed to invite users to community", "Failed to invite users to %(groupId)s": "Failed to invite users to %(groupId)s", "Failed to add the following rooms to %(groupId)s:": "Failed to add the following rooms to %(groupId)s:", + "Unnamed Room": "Unnamed Room", "Riot does not have permission to send you notifications - please check your browser settings": "Riot does not have permission to send you notifications - please check your browser settings", "Riot was not given permission to send notifications - please try again": "Riot was not given permission to send notifications - please try again", "Unable to enable Notifications": "Unable to enable Notifications", @@ -104,7 +109,6 @@ "You need to be logged in.": "You need to be logged in.", "You need to be able to invite users to do that.": "You need to be able to invite users to do that.", "Unable to create widget.": "Unable to create widget.", - "Reload widget": "Reload widget", "Missing roomId.": "Missing roomId.", "Failed to send request.": "Failed to send request.", "This room is not recognised.": "This room is not recognised.", @@ -180,11 +184,6 @@ "%(names)s and %(count)s others are typing|other": "%(names)s and %(count)s others are typing", "%(names)s and %(count)s others are typing|one": "%(names)s and one other is typing", "%(names)s and %(lastPerson)s are typing": "%(names)s and %(lastPerson)s are typing", - "Failure to create room": "Failure to create room", - "Server may be unavailable, overloaded, or you hit a bug.": "Server may be unavailable, overloaded, or you hit a bug.", - "Send anyway": "Send anyway", - "Send": "Send", - "Unnamed Room": "Unnamed Room", "Your browser does not support the required cryptography extensions": "Your browser does not support the required cryptography extensions", "Not a valid Riot keyfile": "Not a valid Riot keyfile", "Authentication check failed: incorrect password?": "Authentication check failed: incorrect password?", @@ -298,6 +297,29 @@ "Off": "Off", "On": "On", "Noisy": "Noisy", + "Invalid alias format": "Invalid alias format", + "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", + "Invalid address format": "Invalid address format", + "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", + "not specified": "not specified", + "not set": "not set", + "Remote addresses for this room:": "Remote addresses for this room:", + "Addresses": "Addresses", + "The main address for this room is": "The main address for this room is", + "Local addresses for this room:": "Local addresses for this room:", + "This room has no local addresses": "This room has no local addresses", + "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", + "Invalid community ID": "Invalid community ID", + "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", + "Flair": "Flair", + "Showing flair for these communities:": "Showing flair for these communities:", + "This room is not showing flair for any communities": "This room is not showing flair for any communities", + "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", + "You have enabled URL previews by default.": "You have enabled URL previews by default.", + "You have disabled URL previews by default.": "You have disabled URL previews by default.", + "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", + "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", + "URL Previews": "URL Previews", "Cannot add any more widgets": "Cannot add any more widgets", "The maximum permitted number of widgets have already been added to this room.": "The maximum permitted number of widgets have already been added to this room.", "Add a widget": "Add a widget", @@ -316,6 +338,8 @@ "Key request sent.": "Key request sent.", "Re-request encryption keys from your other devices.": "Re-request encryption keys from your other devices.", "Undecryptable": "Undecryptable", + "Encrypting": "Encrypting", + "Encrypted, not sent": "Encrypted, not sent", "Encrypted by a verified device": "Encrypted by a verified device", "Encrypted by an unverified device": "Encrypted by an unverified device", "Unencrypted message": "Unencrypted message", @@ -394,11 +418,11 @@ "numbullet": "numbullet", "Markdown is disabled": "Markdown is disabled", "Markdown is enabled": "Markdown is enabled", - "Unpin Message": "Unpin Message", - "Jump to message": "Jump to message", "No pinned messages.": "No pinned messages.", "Loading...": "Loading...", "Pinned Messages": "Pinned Messages", + "Unpin Message": "Unpin Message", + "Jump to message": "Jump to message", "%(duration)ss": "%(duration)ss", "%(duration)sm": "%(duration)sm", "%(duration)sh": "%(duration)sh", @@ -531,29 +555,6 @@ "Scroll to unread messages": "Scroll to unread messages", "Jump to first unread message.": "Jump to first unread message.", "Close": "Close", - "Invalid alias format": "Invalid alias format", - "'%(alias)s' is not a valid format for an alias": "'%(alias)s' is not a valid format for an alias", - "Invalid address format": "Invalid address format", - "'%(alias)s' is not a valid format for an address": "'%(alias)s' is not a valid format for an address", - "not specified": "not specified", - "not set": "not set", - "Remote addresses for this room:": "Remote addresses for this room:", - "Addresses": "Addresses", - "The main address for this room is": "The main address for this room is", - "Local addresses for this room:": "Local addresses for this room:", - "This room has no local addresses": "This room has no local addresses", - "New address (e.g. #foo:%(localDomain)s)": "New address (e.g. #foo:%(localDomain)s)", - "Invalid community ID": "Invalid community ID", - "'%(groupId)s' is not a valid community ID": "'%(groupId)s' is not a valid community ID", - "Flair": "Flair", - "Showing flair for these communities:": "Showing flair for these communities:", - "This room is not showing flair for any communities": "This room is not showing flair for any communities", - "New community ID (e.g. +foo:%(localDomain)s)": "New community ID (e.g. +foo:%(localDomain)s)", - "You have enabled URL previews by default.": "You have enabled URL previews by default.", - "You have disabled URL previews by default.": "You have disabled URL previews by default.", - "URL previews are enabled by default for participants in this room.": "URL previews are enabled by default for participants in this room.", - "URL previews are disabled by default for participants in this room.": "URL previews are disabled by default for participants in this room.", - "URL Previews": "URL Previews", "Sunday": "Sunday", "Monday": "Monday", "Tuesday": "Tuesday", @@ -664,6 +665,7 @@ "Delete widget": "Delete widget", "Revoke widget access": "Revoke widget access", "Minimize apps": "Minimize apps", + "Reload widget": "Reload widget", "Popout widget": "Popout widget", "Picture": "Picture", "Edit": "Edit", diff --git a/src/i18n/strings/eu.json b/src/i18n/strings/eu.json index ac2187456e..af04f66fa6 100644 --- a/src/i18n/strings/eu.json +++ b/src/i18n/strings/eu.json @@ -1169,20 +1169,13 @@ "Enable widget screenshots on supported widgets": "Gaitu trepeten pantaila-argazkiak onartzen duten trepetetan", "Send analytics data": "Bidali datu analitikoak", "Muted Users": "Mutututako erabiltzaileak", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du. (Ikusi gure Cookie eta pribatutasun politikak).", - "Help improve Riot by sending usage data? This will use a cookie.": "Riot hobetzen lagundu nahi erabilera datuak bidaliz? Honek cookie bat erabiliko du.", - "Yes please": "Bai mesedez", "Warning: This widget might use cookies.": "Abisua: Trepeta honek cookie-ak erabili litzake.", "Terms and Conditions": "Termino eta baldintzak", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "%(homeserverDomain)s hasiera-zerbitzaria erabiltzen jarraitzeko gure termino eta baldintzak irakurri eta onartu behar dituzu.", "Review terms and conditions": "Irakurri termino eta baldintzak", "Failed to indicate account erasure": "Ezin izan da kontuaren ezabaketa jakinarazi", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Honek zure kontua betiko erabilgaitz bihurtuko du. Ezin izango duzu saioa hasi, eta beste inork ezin izango du erabiltzaile ID bera erabili. Ez dago ekintza hau desegiterik.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Zure kontua desaktibatzean ez dira lehenetsita zuk bidalitako mezuak ezabatuko. Zuk bidalitako mezuak ezabatu nahi badituzu, markatu beheko kutxa.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Matrix-eko mezuen ikusgaitasuna, e-mail mezuen antzekoa da. Zure mezuak ezabatzeak esan nahi du bidali dituzun mezuak ez direla erabiltzaile berriekin partekatuko, baina aurretik zure mezuak jaso dituzten erabiltzaile erregistratuek bere kopia izango dute.", "To continue, please enter your password:": "Jarraitzeko, sartu zure pasahitza:", "password": "pasahitza", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Ezabatu bidali ditudan mezu guztiak nire kontua desaktibatzean. (Abisua: Etorkizuneko erabiltzaileek elkarrizketa partzialak ikusiko dituzte, esperientzia kaskarra sortuz).", "e.g. %(exampleValue)s": "adib. %(exampleValue)s", "Reload widget": "Birkargatu trepeta", "To notify everyone in the room, you must be a": "Gelan dauden guztiei jakinarazteko", diff --git a/src/i18n/strings/fr.json b/src/i18n/strings/fr.json index c3cfdef5fc..9f276f4699 100644 --- a/src/i18n/strings/fr.json +++ b/src/i18n/strings/fr.json @@ -1168,25 +1168,17 @@ "Collapse Reply Thread": "Dévoiler le fil de réponse", "Enable widget screenshots on supported widgets": "Activer les captures d'écran des widgets pris en charge", "Send analytics data": "Envoyer les données analytiques", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Ceci utilisera un cookie.", - "Yes please": "Oui, s'il vous plaît", "Muted Users": "Utilisateurs ignorés", "Warning: This widget might use cookies.": "Avertissement : ce widget utilise peut-être des cookies.", "Terms and Conditions": "Conditions générales", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Pour continuer à utiliser le serveur d'accueil %(homeserverDomain)s, vous devez lire et accepter nos conditions générales.", "Review terms and conditions": "Voir les conditions générales", "Failed to indicate account erasure": "Échec de notification de la suppression du compte", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Cela rendra votre compte inutilisable de façon permanente. Vous ne pourrez plus vous connecter et ne pourrez plus vous enregistrer avec le même identifiant d'utilisateur. Cette action est irréversible.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "Désactiver votre compte ne supprime pas les messages que vous avez envoyés par défaut. Si vous souhaitez supprimer vos messages, cochez la case ci-dessous.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Supprimer vos messages signifie que les messages que vous avez envoyés ne seront pas partagés avec de nouveaux utilisateurs ou les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à vos messages continueront d'en avoir une copie.", "To continue, please enter your password:": "Pour continuer, veuillez renseigner votre mot de passe :", "password": "mot de passe", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Veuillez supprimer tous les messages que j'ai envoyé quand mon compte est désactivé. (Attention : les futurs utilisateurs verront alors des conversations incomplètes, ce qui est une mauvaise expérience).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Votre compte sera inutilisable de façon permanente. Vous ne pourrez plus vous reconnecter et personne ne pourra se réenregistrer avec le même identifiant d'utilisateur. Votre compte quittera tous les salons auxquels il participe et tous ses détails seront supprimés du serveur d'identité. Cette action est irréversible.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "La désactivation du compte ne nous fait pas oublier les messages que vous avez envoyés par défaut. Si vous souhaitez que nous les oubliions, cochez la case ci-dessous.", "e.g. %(exampleValue)s": "par ex. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aider Riot à s'améliorer en envoyant des données d'utilisation ? Cela utilisera un cookie. (Voir nos politiques de cookie et de confidentialité).", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "La visibilité des messages dans Matrix est la même que celle des e-mails. Quand nous oublions vos messages, cela signifie que les messages que vous avez envoyés ne seront partagés avec aucun nouvel utilisateur ou avec les utilisateurs non enregistrés, mais les utilisateurs enregistrés qui ont déjà eu accès à ces messages en conserveront leur propre copie.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Veuillez oublier tous les messages que j'ai envoyé quand mon compte sera désactivé (Avertissement : les futurs utilisateurs verront des conversations incomplètes)", "Reload widget": "Recharger le widget", diff --git a/src/i18n/strings/hu.json b/src/i18n/strings/hu.json index aa1904d0bf..0be5087d55 100644 --- a/src/i18n/strings/hu.json +++ b/src/i18n/strings/hu.json @@ -1168,27 +1168,19 @@ "Collapse Reply Thread": "Beszélgetés szál becsukása", "Enable widget screenshots on supported widgets": "Ahol az a kisalkalmazásban támogatott ott képernyőkép készítés engedélyezése", "Send analytics data": "Analitikai adatok küldése", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ. (Nézd meg a sütikről és titoktartási irányelvekről szóló leírást).", - "Help improve Riot by sending usage data? This will use a cookie.": "Szeretnél segíteni a Riot javításában analitikai adatok elküldésével? Ez sütit (cookie) használ.", - "Yes please": "Igen, kérlek", "Muted Users": "Elnémított felhasználók", "Warning: This widget might use cookies.": "Figyelmeztetés: Ez a kisalkalmazás sütiket (cookies) használhat.", "Terms and Conditions": "Általános Szerződési Feltételek", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "A %(homeserverDomain)s szerver használatának folytatásához el kell olvasnod és el kell fogadnod az általános szerződési feltételeket.", "Review terms and conditions": "Általános Szerződési Feltételek elolvasása", "Failed to indicate account erasure": "A fiók törlésének jelzése sikertelen", - "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This action is irreversible.": "Ezzel a felhasználói fiókod végleg használhatatlanná válik. Nem tudsz bejelentkezni, és senki más sem fog tudni újra regisztrálni ugyanezzel az azonosítóval. Ez a művelet visszafordíthatatlan.", - "Deactivating your account does not by default erase messages you have sent. If you would like to erase your messages, please tick the box below.": "A felhasználói fiók felfüggesztése alapértelmezetten nem töröli semelyik általad küldött üzenetet. Ha az elküldött üzeneteidet törölni szeretnéd pipáld be a jelölőnégyzetet alul.", - "Message visibility in Matrix is similar to email. Erasing your messages means that messages have you sent will not be shared with any new or unregistered users, but registered users who already had access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban olyan mint az e-mail. Az üzeneted törlése azt jelenti, hogy amit elküldtél már nem lesz megosztva új- vagy vendég felhasználóval, de azok a regisztrált felhasználók akik már látták az üzenetet továbbra is hozzáférnek a saját példányukhoz.", "To continue, please enter your password:": "Folytatáshoz add meg a jelszavad:", "password": "jelszó", - "Please erase all messages I have sent when my account is deactivated. (Warning: this will cause future users to see an incomplete view of conversations, which is a bad experience).": "Töröld az összes üzenetet amit küldtem amikor felfüggeszted a felhasználói fiókomat. (Figyelem: ezzel a jövőbeni felhasználók csak részleges beszélgetést láthatnak majd, ami rosszul eshet).", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Ez végleg használhatatlanná teszi a fiókodat. Ezután nem fogsz tudni bejelentkezni, és más sem tud majd ezzel az azonosítóval fiókot létrehozni. Minden szobából amibe beléptél ki fogsz lépni, és törölni fogja minden fiók adatod az \"identity\" szerverről. Ez a művelet visszafordíthatatlan.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "A fiókod felfüggesztése nem jelenti alapértelmezetten azt, hogy az általad küldött üzenetek elfelejtődnek. Ha törölni szeretnéd az általad küldött üzeneteket, pipáld be a jelölőnégyzetet alul.", "Message visibility in Matrix is similar to email. Our forgetting your messages means that messages you have sent will not be shared with any new or unregistered users, but registered users who already have access to these messages will still have access to their copy.": "Az üzenetek láthatósága a Matrixban hasonlít az emailhez. Az általad küldött üzenet törlése azt jelenti, hogy nem osztjuk meg új-, vagy vendég felhasználóval de a már regisztrált felhasználók akik már hozzáfértek az üzenethez továbbra is elérik a saját másolatukat.", "Please forget all messages I have sent when my account is deactivated (Warning: this will cause future users to see an incomplete view of conversations)": "Kérlek töröld az összes általam küldött üzenetet amikor a fiókomat felfüggesztem (Figyelem: ez azt eredményezheti, hogy a jövőbeni felhasználók csak részleges beszélgetést látnak majd)", "e.g. %(exampleValue)s": "pl. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Segítesz jobbá tenni a Riotot használati adat küldésével? Ez sütit (cookie) fog használni. (Nézd meg az Általános Szerződési Feltételeket).", "Reload widget": "Kisalkalmazás újratöltése", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni (lásd a sütire vonatkozó szabályozásunkat).", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie.": "Kérlek segíts javítani a Riot.im-et azzal, hogy anonim felhasználási adatokat küldesz. Ez szütit (cookie) fog használni.", diff --git a/src/i18n/strings/is.json b/src/i18n/strings/is.json index d901c52f60..234def7dba 100644 --- a/src/i18n/strings/is.json +++ b/src/i18n/strings/is.json @@ -628,7 +628,6 @@ "No Microphones detected": "Engir hljóðnemar fundust", "No Webcams detected": "Engar vefmyndavélar fundust", "Homeserver is": "Heimanetþjónn er", - "Login as guest": "Skrá inn sem gestur", "Sign in to get started": "Skráðu þig inn til að komast í gang", "Failed to fetch avatar URL": "Ekki tókst að sækja slóð á auðkennismynd", "Set a display name:": "Stilltu birtingarnafn:", diff --git a/src/i18n/strings/it.json b/src/i18n/strings/it.json index 884dac4269..61c80b6789 100644 --- a/src/i18n/strings/it.json +++ b/src/i18n/strings/it.json @@ -1158,9 +1158,6 @@ "Refresh": "Aggiorna", "We encountered an error trying to restore your previous session.": "Abbiamo riscontrato un errore tentando di ripristinare la tua sessione precedente.", "Send analytics data": "Invia dati statistici", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie. (Vedi la nostra politica sui cookie e sulla privacy).", - "Help improve Riot by sending usage data? This will use a cookie.": "Aiutare a migliorare Riot inviando statistiche d'uso? Verrà usato un cookie.", - "Yes please": "Sì grazie", "Clear Storage and Sign Out": "Elimina lo storage e disconnetti", "Send Logs": "Invia i log", "Clearing your browser's storage may fix the problem, but will sign you out and cause any encrypted chat history to become unreadable.": "Eliminare lo storage del browser potrebbe risolvere il problema, ma verrai disconnesso e la cronologia delle chat criptate sarà illeggibile.", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index a7e590c7ed..55840f752e 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -1166,16 +1166,12 @@ "Enable widget screenshots on supported widgets": "Включить скриншоты виджета в поддерживаемых виджетах", "Collapse Reply Thread": "Ответить с цитированием", "Send analytics data": "Отправить данные аналитики", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie. (См. наши политики cookie и конфиденциальности).", - "Help improve Riot by sending usage data? This will use a cookie.": "Помогите улучшить Riot, отправляя данные об использовании? Будут использоваться файлы cookie.", - "Yes please": "Да, пожалуйста", "Muted Users": "Приглушенные пользователи", "Warning: This widget might use cookies.": "Внимание: этот виджет может использовать cookie.", "Terms and Conditions": "Условия и положения", "To continue using the %(homeserverDomain)s homeserver you must review and agree to our terms and conditions.": "Для продолжения использования сервера %(homeserverDomain)s вы должны ознакомиться и принять условия и положения.", "Review terms and conditions": "Просмотр условий и положений", "e.g. %(exampleValue)s": "напр. %(exampleValue)s", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "Помогите улучшить Riot, отправляя данные использования? Будут использоваться файлы cookie. (Смотрите наши политики cookie и конфиденциальности).", "Failed to indicate account erasure": "Не удается удалить учетную запись", "This will make your account permanently unusable. You will not be able to log in, and no one will be able to re-register the same user ID. This will cause your account to leave all rooms it is participating in, and it will remove your account details from your identity server. This action is irreversible.": "Это навсегда сделает вашу учетную запись невозможной для использования. Вы не сможете войти в систему, и никто не сможет перерегистрировать тот же идентификатор пользователя. Это приведет к тому, что ваша учетная запись выйдет из всех комнат, в которые она входит, и будут удалены данные вашей учетной записи с сервера идентификации. Это действие необратимо.", "Deactivating your account does not by default cause us to forget messages you have sent. If you would like us to forget your messages, please tick the box below.": "По умолчанию деактивация вашей учетной записи не приведет к удалению всех ваших сообщений. Если вы хотите, чтобы мы удалили ваши сообщения, поставьте отметку в поле ниже.", diff --git a/src/i18n/strings/sv.json b/src/i18n/strings/sv.json index 5e27d5713d..9dcc74d790 100644 --- a/src/i18n/strings/sv.json +++ b/src/i18n/strings/sv.json @@ -900,8 +900,6 @@ "This setting cannot be changed later!": "Den här inställningen kan inte ändras senare!", "Unknown error": "Okänt fel", "Incorrect password": "Felaktigt lösenord", - "This will make your account permanently unusable. You will not be able to re-register the same user ID.": "Detta kommer att göra ditt konto permanent oanvändbart. Du kommer inte att kunna registrera samma användar-ID igen.", - "This action is irreversible.": "Denna åtgärd går inte att ångra.", "To verify that this device can be trusted, please contact its owner using some other means (e.g. in person or a phone call) and ask them whether the key they see in their User Settings for this device matches the key below:": "För att verifiera att denna enhet kan litas på, vänligen kontakta ägaren på annat sätt (t ex personligen eller med ett telefonsamtal) och fråga om nyckeln ägaren har i sina användarinställningar för enheten matchar nyckeln nedan:", "Device name": "Enhetsnamn", "Device key": "Enhetsnyckel", diff --git a/src/i18n/strings/zh_Hant.json b/src/i18n/strings/zh_Hant.json index e8217e0277..88cc5b6ad2 100644 --- a/src/i18n/strings/zh_Hant.json +++ b/src/i18n/strings/zh_Hant.json @@ -1169,9 +1169,6 @@ "Enable widget screenshots on supported widgets": "在支援的小工具上啟用小工具螢幕快照", "Send analytics data": "傳送分析資料", "Muted Users": "已靜音的使用者", - "Help improve Riot by sending usage data? This will use a cookie. (See our cookie and privacy policies).": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。（參見我們的 cookie 與隱私政策）。", - "Help improve Riot by sending usage data? This will use a cookie.": "透過傳送使用情形資料來協助改善 Riot？這會使用 cookie。", - "Yes please": "好的，請", "e.g. %(exampleValue)s": "範例：%(exampleValue)s", "Reload widget": "重新載入小工具", "Please help improve Riot.im by sending anonymous usage data. This will use a cookie (please see our Cookie Policy).": "請透過傳送匿名使用資料來協助改善 Riot.im。這將會使用 cookie（請參見我們的 Cookie 政策）。",