From 2d6bf5fa910011405d4bc0b7dc316b866a6c88ba Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 25 May 2017 20:04:28 +0100 Subject: [PATCH] Remove messages with HTML formatting The translations strings are not HTML and it gets escaped. --- src/components/structures/RoomView.js | 4 ++-- src/components/views/rooms/RoomSettings.js | 6 +++--- src/i18n/strings/da.json | 2 +- src/i18n/strings/de_DE.json | 8 ++++---- src/i18n/strings/en_EN.json | 8 ++++---- src/i18n/strings/pt.json | 8 ++++---- src/i18n/strings/pt_BR.json | 8 ++++---- src/i18n/strings/ru.json | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js index badc7cd01d..4b3b09f1fa 100644 --- a/src/components/structures/RoomView.js +++ b/src/components/structures/RoomView.js @@ -536,8 +536,8 @@ module.exports = React.createClass({ description: (

{ _t("End-to-end encryption is in beta and may not be reliable") }.

-

{ _t("You should not yet trust it to secure data") }.

-

{ _t("Devices will not yet be able to decrypt history from before they joined the room") }.

+

{ _t("You should not yet trust it to secure data") }.

+

{ _t("Devices will not yet be able to decrypt history from before they joined the room") }.

{ _t("Encrypted messages will not be visible on clients that do not yet implement encryption") }.

), diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js index bff668ac85..e50bcdde46 100644 --- a/src/components/views/rooms/RoomSettings.js +++ b/src/components/views/rooms/RoomSettings.js @@ -542,9 +542,9 @@ module.exports = React.createClass({ description: (

{ _t('End-to-end encryption is in beta and may not be reliable') }.

-

{ _t('You should not yet trust it to secure data') }.

-

{ _t('Devices will not yet be able to decrypt history from before they joined the room') }.

-

{ _t('Once encryption is enabled for a room it cannot be turned off again (for now)') }.

+

{ _t('You should not yet trust it to secure data') }.

+

{ _t('Devices will not yet be able to decrypt history from before they joined the room') }.

+

{ _t('Once encryption is enabled for a room it cannot be turned off again (for now)') }.

{ _t('Encrypted messages will not be visible on clients that do not yet implement encryption') }.

), diff --git a/src/i18n/strings/da.json b/src/i18n/strings/da.json index 13491eb0b9..72e0ae60c2 100644 --- a/src/i18n/strings/da.json +++ b/src/i18n/strings/da.json @@ -100,7 +100,7 @@ "decline": "nedgang", "Default": "Standard", "demote": "degradere", - "Devices will not yet be able to decrypt history from before they joined the room": "Enhederne vil ikke være i stand til at dekryptere historikken fra, før de kom til rummet", + "Devices will not yet be able to decrypt history from before they joined the room": "Enhederne vil ikke være i stand til at dekryptere historikken fra, før de kom til rummet", "Direct Chat": "Personligt Chat", "Disable inline URL previews by default": "Deaktiver forrige weblinks forhåndsvisninger som standard", "Display name": "Visningsnavn", diff --git a/src/i18n/strings/de_DE.json b/src/i18n/strings/de_DE.json index dc1cc1dbb6..ffe46f5723 100644 --- a/src/i18n/strings/de_DE.json +++ b/src/i18n/strings/de_DE.json @@ -84,7 +84,7 @@ "Deactivate Account": "Deaktiviere Account", "Deactivate my account": "Deaktiviere meinen Account", "decline": "Ablehnen", - "Devices will not yet be able to decrypt history from before they joined the room": "Geräte werden nicht in der Lage sein, die Historie vor dem Beitritt in den Raum zu entschlüsseln", + "Devices will not yet be able to decrypt history from before they joined the room": "Geräte werden nicht in der Lage sein, die Historie vor dem Beitritt in den Raum zu entschlüsseln", "Display name": "Anzeigename", "Email Address": "E-Mail-Adresse", "Email, name or matrix ID": "E-Mail, Name oder Matrix-ID", @@ -163,7 +163,7 @@ "": "", "No users have specific privileges in this room": "Keine Nutzer haben in diesem Raum besondere Berechtigungen", "olm version": "OLM-Version", - "Once encryption is enabled for a room it cannot be turned off again (for now)": "Sobald Verschlüsselung für einen Raum aktiviert wird, kann diese (aktuell noch) nicht wieder deaktiviert werden", + "Once encryption is enabled for a room it cannot be turned off again (for now)": "Sobald Verschlüsselung für einen Raum aktiviert wird, kann diese (aktuell noch) nicht wieder deaktiviert werden", "Only people who have been invited": "Nur Personen die eingeladen wurden", "or": "oder", "other": "weiteres", @@ -186,7 +186,7 @@ "removed their display name": "löschte den eigenen Anzeigenamen", "Remove": "Entferne", "requested a VoIP conference": "hat eine VoIP-Konferenz angefordert", - "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved": "Eine Passwortänderung sorgt aktuell dafür, dass alle Ende-zu-Ende-Schlüssel von allen Geräten zurückgesetzt werden. Dadurch wird die verschlüsselte Chat-Historie unlesbar, es sei denn Sie exportieren vorher Ihre Raum-Schlüssel und importieren sie nachher wieder. In Zukunft wird dies verbessert", + "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved": "Eine Passwortänderung sorgt aktuell dafür, dass alle Ende-zu-Ende-Schlüssel von allen Geräten zurückgesetzt werden. Dadurch wird die verschlüsselte Chat-Historie unlesbar, es sei denn Sie exportieren vorher Ihre Raum-Schlüssel und importieren sie nachher wieder. In Zukunft wird dies verbessert", "restore": "Zum zurücksetzen", "Return to login screen": "Zur Anmeldung zurückkehren", "Room Colour": "Raumfarbe", @@ -277,7 +277,7 @@ "You have been logged out of all devices and will no longer receive push notifications. To re-enable notifications, sign in again on each device": "Du wurdest von allen Geräten ausgeloggt und wirst keine Push-Benachrichtigungen mehr bekommen. Um Benachrichtigungen zu reaktivieren melde dich auf jedem Gerät neu an", "you must be a": "nötige Rolle", "Your password has been reset": "Dein Passwort wurde zurückgesetzt", - "You should not yet trust it to secure data": "Du solltest nicht darauf vertrauen um deine Daten abzusichern", + "You should not yet trust it to secure data": "Du solltest nicht darauf vertrauen um deine Daten abzusichern", "removed their profile picture": "löschte das eigene Profilbild", "times": "mal", "Bulk Options": "Bulk-Optionen", diff --git a/src/i18n/strings/en_EN.json b/src/i18n/strings/en_EN.json index 13a65e6a9c..9afe796086 100644 --- a/src/i18n/strings/en_EN.json +++ b/src/i18n/strings/en_EN.json @@ -215,7 +215,7 @@ "Deops user with given id": "Deops user with given id", "Device ID": "Device ID", "Devices": "Devices", - "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room", + "Devices will not yet be able to decrypt history from before they joined the room": "Devices will not yet be able to decrypt history from before they joined the room", "Direct Chat": "Direct Chat", "Direct chats": "Direct chats", "Disable inline URL previews by default": "Disable inline URL previews by default", @@ -354,7 +354,7 @@ "No users have specific privileges in this room": "No users have specific privileges in this room", "OK": "OK", "olm version:": "olm version:", - "Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)", + "Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)", "Once you've followed the link it contains, click below": "Once you've followed the link it contains, click below", "Only people who have been invited": "Only people who have been invited", "or": "or", @@ -384,7 +384,7 @@ "Remove": "Remove", "%(senderName)s requested a VoIP conference": "%(senderName)s requested a VoIP conference", "Report it": "Report it", - "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved": "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved", + "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved": "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved", "restore": "restore", "Return to app": "Return to app", "Return to login screen": "Return to login screen", @@ -542,7 +542,7 @@ "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them", "You seem to be in a call, are you sure you want to quit?": "You seem to be in a call, are you sure you want to quit?", "You seem to be uploading files, are you sure you want to quit?": "You seem to be uploading files, are you sure you want to quit?", - "You should not yet trust it to secure data": "You should not yet trust it to secure data", + "You should not yet trust it to secure data": "You should not yet trust it to secure data", "You will not be able to undo this change as you are promoting the user to have the same power level as yourself": "You will not be able to undo this change as you are promoting the user to have the same power level as yourself", "Sun": "Sun", "Mon": "Mon", diff --git a/src/i18n/strings/pt.json b/src/i18n/strings/pt.json index d166b3a273..f14f2b31f4 100644 --- a/src/i18n/strings/pt.json +++ b/src/i18n/strings/pt.json @@ -60,7 +60,7 @@ "demote": "reduzir prioridade", "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado", "Device ID": "Identificador do dispositivo", - "Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos não serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala", + "Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos não serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala", "Direct Chat": "Conversa pessoal", "Disable inline URL previews by default": "Desabilitar visualizações prévias por padrão", "Display name": "Nome", @@ -146,7 +146,7 @@ "NOT verified": "NÃO verificado", "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala", "olm version: ": "Versão do olm: ", - "Once encryption is enabled for a room it cannot be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela não poderá ser desativada novamente (ainda)", + "Once encryption is enabled for a room it cannot be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela não poderá ser desativada novamente (ainda)", "Once you've followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo", "Only people who have been invited": "Apenas pessoas que tenham sido convidadas", "or": "ou", @@ -171,7 +171,7 @@ "removed their profile picture": "removeu sua foto de perfil", "Remove": "Remover", "requested a VoIP conference": "requisitou uma conferência VoIP", - "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado", + "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado", "restore": "restaurar", "Return to app": "Retornar ao aplicativo", "Return to login screen": "Retornar à tela de login", @@ -277,7 +277,7 @@ "you must be a": "você precisa ser", "Your password has been reset": "Sua senha foi redefinida", "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Sua senha foi alterada com sucesso. Você não receberá notificações em outros dispositivos até que você logue novamente por eles", - "You should not yet trust it to secure data": "Você não deve confiar nela ainda para preservar seus dados", + "You should not yet trust it to secure data": "Você não deve confiar nela ainda para preservar seus dados", "Sun": "Dom", "Mon": "Seg", "Tue": "Ter", diff --git a/src/i18n/strings/pt_BR.json b/src/i18n/strings/pt_BR.json index 2aaca8b9d7..1aebaab694 100644 --- a/src/i18n/strings/pt_BR.json +++ b/src/i18n/strings/pt_BR.json @@ -63,7 +63,7 @@ "demote": "reduzir prioridade", "Deops user with given id": "Retirar função de moderador do usuário com o identificador informado", "Device ID": "Identificador do dispositivo", - "Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos não serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala", + "Devices will not yet be able to decrypt history from before they joined the room": "Os dispositivos não serão ainda capazes de descriptografar o histórico anterior à sua entrada na sala", "Direct Chat": "Conversa pessoal", "Disable inline URL previews by default": "Desabilitar visualizações prévias por padrão", "Display name": "Nome", @@ -149,7 +149,7 @@ "NOT verified": "NÃO verificado", "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala", "olm version: ": "Versão do olm: ", - "Once encryption is enabled for a room it cannot be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela não poderá ser desativada novamente (ainda)", + "Once encryption is enabled for a room it cannot be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela não poderá ser desativada novamente (ainda)", "Once you've followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo", "Only people who have been invited": "Apenas pessoas que tenham sido convidadas", "or": "ou", @@ -175,7 +175,7 @@ "removed their profile picture": "removeu sua foto de perfil", "Remove": "Remover", "requested a VoIP conference": "requisitou uma conferência VoIP", - "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado", + "Resetting password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved": "Atualmente, ao alterar sua senha, você também zera todas as chaves de criptografia ponta-a-ponta em todos os dipositivos, fazendo com que o histórico de conversas da sala não possa mais ser lido, a não ser que você antes exporte suas chaves de sala e as reimporte após a alteração da senha. No futuro, isso será melhorado", "restore": "restaurar", "Return to app": "Retornar ao aplicativo", "Return to login screen": "Retornar à tela de login", @@ -282,7 +282,7 @@ "you must be a": "você precisa ser", "Your password has been reset": "Sua senha foi redefinida", "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Sua senha foi alterada com sucesso. Você não receberá notificações em outros dispositivos até que você logue novamente por eles", - "You should not yet trust it to secure data": "Você não deve confiar nela ainda para preservar seus dados", + "You should not yet trust it to secure data": "Você não deve confiar nela ainda para preservar seus dados", "Sun": "Dom", "Mon": "Seg", "Tue": "Ter", diff --git a/src/i18n/strings/ru.json b/src/i18n/strings/ru.json index c211bace3b..2455317292 100644 --- a/src/i18n/strings/ru.json +++ b/src/i18n/strings/ru.json @@ -58,7 +58,7 @@ "demote": "понижать", "Deops user with given id": "Deops пользователь с данным id", "Device ID": "Устройство ID", - "Devices will not yet be able to decrypt history from before they joined the room": "Устройство еще не будет в состоянии дешифровать историю, до присоединения к комнате", + "Devices will not yet be able to decrypt history from before they joined the room": "Устройство еще не будет в состоянии дешифровать историю, до присоединения к комнате", "Direct Chat": "Персональное сообщение", "Disable inline URL previews by default": "Отключить встроенные предварительные просмотры URL по умолчанию", "Display name": "Отображаемое имя", @@ -136,7 +136,7 @@ "NOT verified": "НЕ проверенный", "No users have specific privileges in this room": "Ни у каких пользователей нет специальных полномочий в этой комнате", "olm version": "olm версия", - "Once encryption is enabled for a room it cannot be turned off again (for now)": "Как только шифрование включено для комнаты, оно не может быть выключено снова (на данный момент)", + "Once encryption is enabled for a room it cannot be turned off again (for now)": "Как только шифрование включено для комнаты, оно не может быть выключено снова (на данный момент)", "or": "или", "other": "другой", "others": "другие", @@ -210,7 +210,7 @@ "you must be a": "Вы должны быть", "Your password has been reset": "Ваш пароль был изменен", "Your password was successfully changed. You will not receive push notifications on other devices until you log back in to them": "Ваш пароль был успешно изменен. Вы не будете получать Push-уведомления о других устройствах, пока не войдете обратно на них", - "You should not yet trust it to secure data": "Вы еще не должны доверять этому защиту данных", + "You should not yet trust it to secure data": "Вы еще не должны доверять этому защиту данных", "en": "Английский", "pt-br": "Португальский Бразилия", "de": "Немецкий",