Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Merge pull request #1803 from matrix-org/dbkr/remove_crypto_migrated_…
Browse files Browse the repository at this point in the history
…message

Remove the message on migrating crypto data
  • Loading branch information
dbkr authored Mar 16, 2018
2 parents b68da57 + f427695 commit e9161df
Show file tree
Hide file tree
Showing 27 changed files with 1 addition and 63 deletions.
12 changes: 0 additions & 12 deletions src/components/structures/MatrixChat.js
Original file line number Diff line number Diff line change
Expand Up @@ -1171,18 +1171,6 @@ export default React.createClass({
cli.on("crypto.warning", (type) => {
const ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
switch (type) {
case 'CRYPTO_WARNING_ACCOUNT_MIGRATED':
Modal.createTrackedDialog('Crypto migrated', '', ErrorDialog, {
title: _t('Cryptography data migrated'),
description: _t(
"A one-off migration of cryptography data has been performed. "+
"End-to-end encryption will not work if you go back to an older "+
"version of Riot. If you need to use end-to-end cryptography on "+
"an older version, log out of Riot first. To retain message history, "+
"export and re-import your keys.",
),
});
break;
case 'CRYPTO_WARNING_OLD_VERSION_DETECTED':
Modal.createTrackedDialog('Crypto migrated', '', ErrorDialog, {
title: _t('Old cryptography data detected'),
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/ca.json
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,6 @@
"Encryption is enabled in this room": "L'encriptació està activada en aquesta sala",
"Encryption is not enabled in this room": "L'encriptació no està activada en aquesta sala",
"Privileged Users": "Usuaris amb privilegis",
"%(user)s is a": "L'usuari %(user)s és",
"No users have specific privileges in this room": "Cap usuari té privilegis específics en aquesta sala",
"Banned users": "Usuaris expulsats",
"This room is not accessible by remote Matrix servers": "Aquesta sala no és accessible per a servidors de Matrix remots",
Expand Down Expand Up @@ -778,8 +777,6 @@
"Are you sure you want to leave the room '%(roomName)s'?": "Esteu segur que voleu sortir de la sala '%(roomName)s'?",
"Failed to leave room": "No s'ha pogut sortir de la sala",
"For security, this session has been signed out. Please sign in again.": "Per seguretat, aquesta sessió s'ha tancat. Torna a iniciar la sessió.",
"Cryptography data migrated": "S'han migrat les dades criptogràfiques",
"A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "S'ha realitzat una migració puntual de les dades criptogràfiques. L'encriptació d'extrem a extrem no funcionarà si torneu a una versió anterior de Riot. Si necessiteu utilitzar l'encriptació d'extrem a extrem en una versió anterior, primer sortiu de Riot. Per poder llegir l'historial dels missatges encriptats, exporteu i torneu a importar les vostres claus.",
"Old cryptography data detected": "S'han detectat dades de criptografia antigues",
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "S'han detectat dades d'una versió antiga de Riot. Això pot provocar que l'encriptació d'extrem a extrem no funcioni correctament a la versió anterior. Els missatges encriptats d'extrem a extrem que s'han intercanviat recentment mentre s'utilitzava la versió anterior no es poden desencriptar en aquesta versió. També pot provocar que els missatges intercanviats amb aquesta versió fallin. Si teniu problemes, tanqueu-lo i torneu-ho a engegar. Per poder llegir l'historial dels missatges encriptats, exporteu i torneu a importar les vostres claus.",
"Logout": "Surt",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@
"Use with caution": "Používejte s opatrností",
"User ID": "Uživatelské ID",
"User Interface": "Uživatelské rozhraní",
"%(user)s is a": "%(user)s je",
"User name": "Uživatelské jméno",
"Username invalid: %(errMessage)s": "Neplatné uživatelské jméno: %(errMessage)s",
"Users": "Uživatelé",
Expand Down Expand Up @@ -947,8 +946,6 @@
"Addresses": "Adresy",
"collapse": "sbalit",
"expand": "rozbalit",
"Cryptography data migrated": "Šifrovaná data byla převedena",
"A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Jednorázová migrace šifrovaných údajů dokončena. E2E šifrovaní vám nebude fungovat jakmile se vrátíte ke starší verzi programu Riot. Pokud plánujete používat šifrovaní ve starší verzi Riot, doporučujeme vám se nejdříve odhlásit. Aby jste si zachovali historii šifrovaných konverzací, exportujte a znovu importujte klíče místností.",
"Old cryptography data detected": "Nalezeny starší šifrované datové zprávy",
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Nalezeny datové zprávy ze starší verze Riot. Důsledkem bude, že E2E šifrování nebude ve starší verzi Riot správně fungovat. Šifrované zprávy ze starší verze nemusí být čitelné v nové verzi. Může dojít i k selhání zasílaní zpráv s touto verzí Riot. Pokud zaznamenáte některý z uvedených problému, odhlaste se a přihlaste znovu. Pro zachování historie zpráv exportujte a znovu importujte vaše klíče.",
"Warning": "Upozornění"
Expand Down
5 changes: 1 addition & 4 deletions src/i18n/strings/de_DE.json
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,6 @@
"Unnamed Room": "Unbenannter Raum",
"Unverified": "Nicht verifiziert",
"Upload new:": "Neue(s) hochladen:",
"%(user)s is a": "%(user)s ist ein",
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (Berechtigungslevel %(powerLevelNumber)s)",
"Verified": "Verifiziert",
"Would you like to <acceptText>accept</acceptText> or <declineText>decline</declineText> this invitation?": "Möchtest du diese Einladung <acceptText>akzeptieren</acceptText> oder <declineText>ablehnen</declineText>?",
Expand Down Expand Up @@ -946,11 +945,9 @@
"Addresses": "Adressen",
"collapse": "Verbergen",
"expand": "Erweitern",
"Cryptography data migrated": "Kryptographie-Schlüssel wurden übertragen",
"Old cryptography data detected": "Alte Kryptografiedaten erkannt",
"Warning": "Warnung",
"A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Eine tiefgreifende Migration im Kontext der Verschlüsselungsdaten wurde durchgeführt. Ende-zu-Ende-Verschlüsselung wird nicht mehr funktionieren, wenn du zu einer älteren Version von Riot zurückkehrst. Wenn du Ende-zu-Ende-Verschlüssung bei einer älteren Version von Riot brauchst, melde dich bitte vorher ab. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wurden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Es wurden Daten von einer älteren Version von Riot entdeckt. Dies wird zu Fehlern in der Ende-zu-Ende-Verschlüsselung der älteren Version geführt haben. Ende-zu-Ende verschlüsselte Nachrichten, die ausgetauscht wruden, während die ältere Version genutzt wurde, werden in dieser Version nicht entschlüsselbar sein. Es kann auch zu Fehlern mit Nachrichten führen, die mit dieser Version versendet werden. Wenn du Probleme feststellst, melde dich ab und wieder an. Um die Historie zu behalten, ex- und reimportiere deine Schlüssel.",
"Send an encrypted reply…": "Verschlüsselte Antwort senden…",
"Send a reply (unencrypted)…": "Antwort senden (unverschlüsselt)…",
"Send an encrypted message…": "Verschlüsselte Nachricht senden…",
Expand Down
1 change: 0 additions & 1 deletion src/i18n/strings/el.json
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@
"Use with caution": "Χρησιμοποιήστε τα με προσοχή",
"User ID": "Αναγνωριστικό χρήστη",
"User Interface": "Διεπαφή χρήστη",
"%(user)s is a": "Ο %(user)s είναι",
"User name": "Όνομα χρήστη",
"Username invalid: %(errMessage)s": "Μη έγκυρο όνομα χρήστη: %(errMessage)s",
"Users": "Χρήστες",
Expand Down
2 changes: 0 additions & 2 deletions src/i18n/strings/en_EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -788,8 +788,6 @@
"Failed to leave room": "Failed to leave room",
"Signed Out": "Signed Out",
"For security, this session has been signed out. Please sign in again.": "For security, this session has been signed out. Please sign in again.",
"Cryptography data migrated": "Cryptography data migrated",
"A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.",
"Old cryptography data detected": "Old cryptography data detected",
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.",
"Logout": "Logout",
Expand Down
1 change: 0 additions & 1 deletion src/i18n/strings/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -639,7 +639,6 @@
"Uploading %(filename)s and %(count)s others|one": "Uploading %(filename)s and %(count)s other",
"Uploading %(filename)s and %(count)s others|other": "Uploading %(filename)s and %(count)s others",
"Upload new:": "Upload new:",
"%(user)s is a": "%(user)s is a",
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
"Username invalid: %(errMessage)s": "Username invalid: %(errMessage)s",
"Verified": "Verified",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/eo.json
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,6 @@
"Encryption is enabled in this room": "Ĉifrado estas ŝaltita en tiu ĉi ĉambro",
"Encryption is not enabled in this room": "Ĉifrado ne estas ŝaltita en tiu ĉi ĉambro",
"Privileged Users": "Privilegiuloj",
"%(user)s is a": "%(user)s estas",
"No users have specific privileges in this room": "Neniuj uzantoj havas specialajn privilegiojn en tiu ĉi ĉambro",
"Banned users": "Forbaritaj uzantoj",
"This room is not accessible by remote Matrix servers": "Ĉi tiu ĉambro ne atingeblas por foraj serviloj de Matrix",
Expand Down Expand Up @@ -752,8 +751,6 @@
"Are you sure you want to leave the room '%(roomName)s'?": "Ĉu vi certe volas forlasi la ĉambron ‹%(roomName)s›?",
"Failed to leave room": "Malsukcesis forlasi la ĉambron",
"Signed Out": "Adiaŭinta",
"Cryptography data migrated": "Kriptografiaj datumoj transmetiĝis",
"A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Unufoja transmeto de kriptografiaj datumoj fariĝis. Ĝiscela ĉifrado ne funkcios se vi revenos al pli malnova versio de Riot. Se vi bezonas ĝiscelan ĉifradon ĉe pli malnova versio, adiaŭu unue. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
"Old cryptography data detected": "Malnovaj kriptografiaj datumoj troviĝis",
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Datumoj el malnova versio de Riot troviĝis. Ĉi tio malfunkciigos ĝiscelan ĉifradon en la malnova versio. Ĝiscele ĉifritaj mesaĝoj interŝanĝitaj freŝtempe per la malnova versio eble ne malĉifreblos. Tio povas kaŭzi malsukceson ankaŭ al mesaĝoj interŝanĝitaj kun tiu ĉi versio. Se vin trafos problemoj, adiaŭu kaj resalutu. Por reteni mesaĝan historion, elportu kaj reenportu viajn ŝlosilojn.",
"Logout": "Adiaŭi",
Expand Down
1 change: 0 additions & 1 deletion src/i18n/strings/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,6 @@
"Use with caution": "Usar con precaución",
"User ID": "Identificación de usuario",
"User Interface": "Interfaz de usuario",
"%(user)s is a": "%(user)s es un",
"User name": "Nombre de usuario",
"Username invalid: %(errMessage)s": "Nombre de usuario no válido: %(errMessage)s",
"Users": "Usuarios",
Expand Down
3 changes: 0 additions & 3 deletions src/i18n/strings/eu.json
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,6 @@
"Use with caution": "Erabili kontuz",
"User ID": "Erabiltzaile ID-a",
"User Interface": "Erabiltzaile interfazea",
"%(user)s is a": "%(user)s hau da:",
"%(userName)s (power %(powerLevelNumber)s)": "%(userName)s (power %(powerLevelNumber)s)",
"Username invalid: %(errMessage)s": "Erabiltzaile-izen baliogabea: %(errMessage)s",
"Users": "Erabiltzaileak",
Expand Down Expand Up @@ -821,7 +820,6 @@
"Long Description (HTML)": "Deskripzio luzea (HTML)",
"Description": "Deskripzioa",
"Community %(groupId)s not found": "Ez da %(groupId)s komunitatea aurkitu",
"Cryptography data migrated": "Kriptografia datuak migratuta",
"Old cryptography data detected": "Kriptografia datu zaharrak atzeman dira",
"Your Communities": "Zure komunitateak",
"Create a new community": "Sortu komunitate berria",
Expand Down Expand Up @@ -942,7 +940,6 @@
"Try using one of the following valid address types: %(validTypesList)s.": "Saiatu baliozko helbide mota hauetako bat erabiltzen: %(validTypesList)s.",
"Community IDs may only contain characters a-z, 0-9, or '=_-./'": "Komunitate IDak a-z, 0-9, edo '=_-./' karaktereak besterik ez ditu onartzen",
"Custom of %(powerLevel)s": "%(powerLevel)s pertsonalizatua",
"A one-off migration of cryptography data has been performed. End-to-end encryption will not work if you go back to an older version of Riot. If you need to use end-to-end cryptography on an older version, log out of Riot first. To retain message history, export and re-import your keys.": "Kriptografia datuen migrazio bat egon da. Muturretik muturrerako zifratzeak ez du funtzionatuko Riot bertsio zaharrago bat erabiltzen baduzu. Muturretik muturrerako zifratzea erabili behar baduzu bertsio zaharrago batean amaitu saioa Rioten lehenbizi. Mezuen historiala gordetzeko esportatu eta berriro inportatu zure gakoak.",
"Data from an older version of Riot has been detected. This will have caused end-to-end cryptography to malfunction in the older version. End-to-end encrypted messages exchanged recently whilst using the older version may not be decryptable in this version. This may also cause messages exchanged with this version to fail. If you experience problems, log out and back in again. To retain message history, export and re-import your keys.": "Riot bertsio zahar batek datuak antzeman dira. Honek bertsio zaharrean muturretik muturrerako zifratzea ez funtzionatzea eragingo du. Azkenaldian bertsio zaharrean bidali edo jasotako zifratutako mezuak agian ezin izango dira deszifratu bertsio honetan. Honek ere Bertsio honekin egindako mezu trukeak huts egitea ekar dezake. Arazoak badituzu, amaitu saioa eta hasi berriro saioa. Mezuen historiala gordetzeko, esportatu eta berriro inportatu zure gakoak.",
"Create a community to group together users and rooms! Build a custom homepage to mark out your space in the Matrix universe.": "Sortu komunitate bat erabiltzaileak eta gelak biltzeko! Sortu zure hasiera orria eta markatu zure espazioa Matrix unibertsoan.",
"To join an existing community you'll have to know its community identifier; this will look something like <i>+example:matrix.org</i>.": "Bdagoen komunitate batera elkartzeko, komunitatearen identifikatzailea jakin behar duzu; honen antza izango du <i>+adibidea:matrix.org</i>.",
Expand Down
Loading

0 comments on commit e9161df

Please sign in to comment.